Skip to content

Commit a4ca747

Browse files
author
Himani Anil Deshpande
committed
[NVIDIA-IMEX] Installing NVIDIA IMEx using install_packages resource
1 parent d846cf1 commit a4ca747

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/partial/_nvidia_imex_common.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
action :create
4949
end
5050

51-
package "nvidia-imex-#{_nvidia_imex_version}" do
52-
retries 3
53-
retry_delay 5
54-
# version _nvidia_imex_version
51+
install_packages 'Install nvidia-imex' do
52+
packages "nvidia-imex-#{_nvidia_imex_version}"
53+
action :install
5554
end
55+
# Save Imex version in Node Attributes for InSpec Tests
56+
node.default['cluster']['nvidia']['imex']['version'] = _nvidia_imex_version
57+
node_attributes 'dump node attributes'
5658
end
5759

5860
action :configure do

cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_imex_spec.rb

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ def self.install(chef_run)
176176
"1_1.2.3-1"
177177
end
178178
end
179+
cached(:node) { chef_run.node }
179180

180181
before do
181182
chef_run.node.override['cluster']['shared_dir'] = shared_dir
@@ -203,10 +204,13 @@ def self.install(chef_run)
203204
.with(user: 'root')
204205
.with(group: 'root')
205206
.with(mode: '0644')
206-
is_expected.not_to install_package('nvidia-imex')
207-
.with(retries: 3)
208-
.with(retry_delay: 5)
209-
.with(version: nvidia_imex_version)
207+
is_expected.not_to install_install_packages('Install nvidia-imex')
208+
.with(packages: "nvidia-imex-#{nvidia_imex_version}")
209+
.with(action: %i(install))
210+
end
211+
it 'does not set nvidia-imex version' do
212+
expect(node.default['cluster']['nvidia']['imex']['version']).not_to eq(nvidia_imex_version)
213+
is_expected.not_to write_node_attributes('dump node attributes')
210214
end
211215
else
212216
it 'installs nvidia-imex' do
@@ -228,10 +232,13 @@ def self.install(chef_run)
228232
.with(user: 'root')
229233
.with(group: 'root')
230234
.with(mode: '0644')
231-
is_expected.to install_package('nvidia-imex')
232-
.with(retries: 3)
233-
.with(retry_delay: 5)
234-
.with(version: nvidia_imex_version)
235+
is_expected.to install_install_packages('Install nvidia-imex')
236+
.with(packages: "nvidia-imex-#{nvidia_imex_version}")
237+
.with(action: %i(install))
238+
end
239+
it 'sets nvidia-imex version' do
240+
expect(node.default['cluster']['nvidia']['imex']['version']).to eq(nvidia_imex_version)
241+
is_expected.to write_node_attributes('dump node attributes')
235242
end
236243
end
237244
end

cookbooks/aws-parallelcluster-platform/test/controls/nvidia_imex_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
describe package('nvidia-imex') do
1616
it { should be_installed }
17-
its('version') { should match /#{node['cluster']['nvidia']['driver_version']}/ }
17+
its('version') { should match /#{node['cluster']['nvidia']['imex']['version']}/ }
1818
end
1919

2020
%w(/usr/bin/nvidia-imex /usr/bin/nvidia-imex-ctl).each do |path|

0 commit comments

Comments
 (0)