Skip to content

Commit 7eb840f

Browse files
himani2411Himani Deshpande
andauthored
[Dependencies] Overriding the NVIDIA version for Centos7 using node_attributes (#2657)
* [Dependencies] Overriding the NVIDIA version for Centos7 using node_attributes * Revert "[kitchen tests] Fix pinning NVIDIA version for Centos7 to 535.129.03 (#2648)" This reverts commit 295f44c. --------- Co-authored-by: Himani Deshpande <[email protected]>
1 parent aa2b503 commit 7eb840f

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

cookbooks/aws-parallelcluster-platform/resources/nvidia_driver/partial/_nvidia_driver_common.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
return unless nvidia_driver_enabled?
2424
return if on_docker?
2525

26+
# Share nvidia driver version with InSpec tests
27+
node.default['cluster']['nvidia']['driver_version'] = _nvidia_driver_version
28+
node_attributes "Save Nvidia driver version for Inspec tests"
29+
2630
remote_file tmp_nvidia_run do
2731
source nvidia_driver_url
2832
mode '0755'

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ def self.setup(chef_run, nvidia_driver_version: nil)
187187
end
188188
cached(:node) { chef_run.node }
189189

190+
it 'dumps nodes attribues' do
191+
is_expected.to write_node_attributes('Save Nvidia driver version for Inspec tests')
192+
end
193+
190194
it 'sets up nvidia_driver' do
191195
is_expected.to setup_nvidia_driver('setup')
192196
end

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
(node['cluster']['nvidia']['enabled'] == 'yes' || node['cluster']['nvidia']['enabled'] == true)
1616
end
1717

18-
expected_nvidia_driver_version = if os_properties.centos7?
19-
'535.129.03'
20-
else
21-
node['cluster']['nvidia']['driver_version']
22-
end
18+
expected_nvidia_driver_version = node['cluster']['nvidia']['driver_version']
2319
expected_nvidia_kernel_license = 'Dual MIT/GPL'
2420
expected_nvidia_kernel_module = "NVRM version: NVIDIA UNIX Open Kernel Module"
2521

0 commit comments

Comments
 (0)