Skip to content

Commit 15869b1

Browse files
himani2411Himani Deshpande
andauthored
Revert "Changing the PATH order we set for using the cfnbootstrap script we have installed in virtualenv rather than using default scripts (#2729)" (#2739)
This reverts commit d086657. Co-authored-by: Himani Deshpande <[email protected]>
1 parent 19ee141 commit 15869b1

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

cookbooks/aws-parallelcluster-environment/templates/cfn_bootstrap/pcluster.sh.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# pcluster.sh:
33
# Setup ParallelCluster environment variables
44
#
5-
PATH=<%= @cfn_bootstrap_virtualenv_path %>/bin:$PATH
5+
6+
PATH=$PATH:<%= @cfn_bootstrap_virtualenv_path %>/bin
67

78
export PATH

cookbooks/aws-parallelcluster-environment/test/controls/cfn_bootstrap_spec.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
its('mode') { should cmp '0644' }
3737
its('owner') { should eq 'root' }
3838
its('group') { should eq 'root' }
39-
its('content') { should match "PATH=#{pyenv_dir}/versions/#{cfn_python_version}/envs/cfn_bootstrap_virtualenv/bin:\\$PATH" }
39+
its('content') { should match "PATH=\\$PATH:#{pyenv_dir}/versions/#{cfn_python_version}/envs/cfn_bootstrap_virtualenv/bin" }
4040
end
41-
42-
desc "cfn-init needs to be from the cfnbootstrap virtualenv"
43-
describe bash("sudo -u #{node['cluster']['cluster_user']} -i which cfn-init") do
44-
its('exit_status') { should eq(0) }
45-
its('stdout') { should match("#{pyenv_dir}/versions/#{cfn_python_version}/envs/cfn_bootstrap_virtualenv/bin/cfn-init") }
46-
end unless os_properties.on_docker?
4741
end

0 commit comments

Comments
 (0)