Skip to content

Changing the PATH order we set for using the cfnbootstrap script we have installed in virtualenv rather than using default scripts #2730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2024
Merged

Changing the PATH order we set for using the cfnbootstrap script we have installed in virtualenv rather than using default scripts #2730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cookbooks/aws-parallelcluster-environment/templates/cfn_bootstrap/pcluster.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# pcluster.sh:
# Setup ParallelCluster environment variables
#

PATH=$PATH:<%= @cfn_bootstrap_virtualenv_path %>/bin
PATH=<%= @cfn_bootstrap_virtualenv_path %>/bin:$PATH

export PATH
8 changes: 7 additions & 1 deletion cookbooks/aws-parallelcluster-environment/test/controls/cfn_bootstrap_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
its('mode') { should cmp '0644' }
its('owner') { should eq 'root' }
its('group') { should eq 'root' }
its('content') { should match "PATH=\\$PATH:#{pyenv_dir}/versions/#{cfn_python_version}/envs/cfn_bootstrap_virtualenv/bin" }
its('content') { should match "PATH=#{pyenv_dir}/versions/#{cfn_python_version}/envs/cfn_bootstrap_virtualenv/bin:\\$PATH" }
end

desc "cfn-init needs to be from the cfnbootstrap virtualenv"
describe bash("sudo -u #{node['cluster']['cluster_user']} -i which cfn-init") do
its('exit_status') { should eq(0) }
its('stdout') { should match("#{pyenv_dir}/versions/#{cfn_python_version}/envs/cfn_bootstrap_virtualenv/bin/cfn-init") }
end unless os_properties.on_docker?
end