Skip to content

Consider string "true" as turning on Lustre, Nvidia installation #2924

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
Mar 27, 2025
Merged

Consider string "true" as turning on Lustre, Nvidia installation #2924

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
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-environment/libraries/fsx.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ def aws_domain_for_fsx(region)
end

def lustre_enabled?
['yes', true].include?(node['cluster']['lustre']['enabled'])
['yes', true, 'true'].include?(node['cluster']['lustre']['enabled'])
end
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-platform/libraries/nvidia.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def nvidia_enabled?
['yes', true].include?(node['cluster']['nvidia']['enabled'])
['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled'])
end

#
Expand Down
2 changes: 1 addition & 1 deletion ...s/aws-parallelcluster-platform/resources/fabric_manager/partial/_fabric_manager_common.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def _fabric_manager_enabled
end

def _nvidia_enabled
nvidia_enabled.nil? ? ['yes', true].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
nvidia_enabled.nil? ? ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
end

def _nvidia_driver_version
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-platform/resources/nvidia_dcgm/partial/_nvidia_dcgm_common.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
end

def _nvidia_enabled
nvidia_enabled.nil? ? ['yes', true].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
nvidia_enabled.nil? ? ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) : nvidia_enabled
end

def package_version
Expand Down
6 changes: 3 additions & 3 deletions cookbooks/aws-parallelcluster-platform/test/controls/enroot_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and limitations under the License.

control 'tag:install_expected_version_of_enroot_installed' do
only_if { !os_properties.on_docker? && ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
only_if { !os_properties.on_docker? && ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }

expected_enroot_version = node['cluster']['enroot']['version']

Expand All @@ -31,15 +31,15 @@
end

control 'tag:config_enroot_enabled_on_graphic_instances' do
only_if { !os_properties.on_docker? && ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
only_if { !os_properties.on_docker? && ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }
describe 'enroot service should be enabled' do
subject { command("enroot version") }
its('exit_status') { should cmp == 0 }
end
end

control 'tag:config_enroot_disabled_on_non_graphic_instances' do
only_if { !os_properties.on_docker? && !['yes', true].include?(node['cluster']['nvidia']['enabled']) }
only_if { !os_properties.on_docker? && !['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }

describe 'enroot service should be disabled' do
subject { command("enroot version") }
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-platform/test/controls/nvidia_dcgm_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

control 'tag:install_nvidia_dcgm_installed' do
only_if do
['yes', true].include?(node['cluster']['nvidia']['enabled']) && !instance.custom_ami? &&
['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) && !instance.custom_ami? &&
(!os_properties.arm? || !(os_properties.alinux2? || os_properties.centos?))
end

Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-platform/test/controls/nvidia_fabric_manager_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and limitations under the License.

control 'tag:install_expected_versions_of_nvidia_fabric_manager_installed' do
only_if { !os_properties.arm? && ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
only_if { !os_properties.arm? && ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }

describe package(node['cluster']['nvidia']['fabricmanager']['package']) do
it { should be_installed }
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-slurm/test/controls/pyxis_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and limitations under the License.

control 'tag:install_pyxis_installed' do
only_if { ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
only_if { ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) }

title 'Checks Pyxis has been installed'

Expand Down
Loading