Skip to content

Commit 8a90170

Browse files
committed
Remove ubuntu24 from lustre spec tests
1 parent cd1e5f1 commit 8a90170

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
end
2828
end
2929

30-
if os_properties.redhat? && inspec.os.release.to_f >= 8.2 && !os_properties.on_docker?
30+
if os_properties.redhat? && inspec.os.release.to_f >= 8.2 && !os_properties.on_docker? && !os_properties.ubuntu2404?
3131
# TODO: restore installation and check on docker when Lustre is available for RH8.9
3232
# See: https://docs.aws.amazon.com/fsx/latest/LustreGuide/install-lustre-client.html
3333
unless inspec.os.release.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
@@ -55,7 +55,7 @@
5555
end
5656
end
5757

58-
if os_properties.debian_family?
58+
if os_properties.debian_family? && !os_properties.ubuntu2404?
5959
describe apt('https://fsx-lustre-client-repo.s3.amazonaws.com/ubuntu') do
6060
it { should exist }
6161
it { should be_enabled }
@@ -89,7 +89,7 @@
8989

9090
control 'tag:install_lustre_lnet_kernel_module_enabled' do
9191
title "Verify that lnet kernel module is enabled"
92-
only_if { !os_properties.on_docker? && !os_properties.alinux? }
92+
only_if { !os_properties.on_docker? && !os_properties.alinux? && !os_properties.ubuntu2404?}
9393
describe kernel_module("lnet") do
9494
it { should be_loaded }
9595
it { should_not be_disabled }
@@ -98,15 +98,15 @@
9898
end
9999

100100
control 'lustre_mounted' do
101-
only_if { !os_properties.on_docker? }
101+
only_if { !os_properties.on_docker? && !os_properties.ubuntu2404? }
102102
describe mount('/shared_dir') do
103103
it { should be_mounted }
104104
its('type') { should eq 'lustre' }
105105
end
106106
end
107107

108108
control 'lustre_unmounted' do
109-
only_if { !os_properties.on_docker? }
109+
only_if { !os_properties.on_docker? && !os_properties.ubuntu2404? }
110110

111111
describe mount('/shared_dir') do
112112
it { should_not be_mounted }

cookbooks/aws-parallelcluster-shared/test/libraries/os_properties.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ def ubuntu2204?
7272
inspec.os.name == 'ubuntu' && inspec.os.release == '22.04'
7373
end
7474

75+
def ubuntu2404?
76+
inspec.os.name == 'ubuntu' && inspec.os.release == '24.04'
77+
end
78+
7579
def debian_family?
7680
inspec.os.family == 'debian'
7781
end

0 commit comments

Comments
 (0)