Skip to content

Commit 101b899

Browse files
himani2411Himani Anil Deshpande
andauthored
Adding Ubuntu24 for kitchen tests for storage (#2915)
* Adding Ubuntu24 for kitchen tests for storage * Adding Rocky9, rhel9 and al2023 --------- Co-authored-by: Himani Anil Deshpande <[email protected]>
1 parent 57352fe commit 101b899

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020

2121
describe 'Check the presence of the cloudwatch package gpg key'
2222
# In Ubuntu >20.04 due to environment variable the keyring is placed under home of the user ubuntu with the permission of root
23-
ubuntu2004 = os_properties.ubuntu2004?
24-
ubuntu2204 = os_properties.ubuntu2204?
25-
keyring = (ubuntu2004 || ubuntu2204) && !os_properties.on_docker? ? '--keyring /home/ubuntu/.gnupg/pubring.kbx' : ''
23+
24+
keyring = os_properties.ubuntu? && !os_properties.on_docker? ? '--keyring /home/ubuntu/.gnupg/pubring.kbx' : ''
2625
sudo = os_properties.redhat_on_docker? ? '' : 'sudo'
2726
describe bash("#{sudo} gpg --list-keys #{keyring}") do
2827
# Don't check exit status for Ubuntu20 because it returns 2 when executed in the validate phase of a created AMI
2928
# os_properties cannot be used in the describe block level. It can be used within an it{} block
30-
its('exit_status') { should eq 0 } unless ubuntu2004 || ubuntu2204
29+
its('exit_status') { should eq 0 } unless os_properties.ubuntu?
3130
its('stdout') { should match /3B789C72/ }
3231
its('stdout') { should match /Amazon CloudWatch Agent/ }
3332
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
control 'tag:config_sticky_bits_configured' do
22
title 'Check sticky bits configuration'
33

4-
if (os_properties.ubuntu2004? || os_properties.ubuntu2204?) && !os_properties.on_docker?
4+
if os_properties.ubuntu? && !os_properties.on_docker?
55
# This test passes on Mac but doesn't work as GitHub action.
66
describe kernel_parameter('fs.protected_regular') do
77
its('value') { should eq 0 }

cookbooks/aws-parallelcluster-slurm/test/controls/mysql_client_spec.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,21 @@
1313
title "MySql client is installed"
1414

1515
mysql_packages = []
16+
ubuntu = os_properties.ubuntu?
1617
if os.redhat?
1718
mysql_packages.concat %w(mysql-community-client-plugins mysql-community-common
1819
mysql-community-devel mysql-community-libs)
1920
if os_properties.alinux2? || os_properties.centos7?
2021
mysql_packages.concat %w(mysql-community-libs-compat)
2122
end
22-
elsif os_properties.ubuntu2004? || os_properties.ubuntu2204?
23+
elsif ubuntu
2324
mysql_packages.concat %w(libmysqlclient-dev libmysqlclient21)
2425
else
2526
describe "unsupported OS" do
2627
pending "support for #{os.name}-#{os.release} needs to be implemented"
2728
end
2829
end
2930

30-
ubuntu = os_properties.ubuntu?
31-
3231
mysql_packages.each do |pkg|
3332
describe package(pkg) do
3433
it { should be_installed }

test/environments/kitchen.rb

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,41 @@
55
name 'kitchen'
66
default_attributes 'kitchen_hooks' => {
77
'ebs_mount-vol_array/alinux2' => '',
8+
'ebs_mount-vol_array/alinux2023' => '',
89
'ebs_mount-vol_array/rhel8' => '',
9-
'ebs_mount-vol_array/centos7' => '',
10+
'ebs_mount-vol_array/rhel9' => '',
1011
'ebs_mount-vol_array/ubuntu2004' => '',
1112
'ebs_mount-vol_array/ubuntu2204' => '',
13+
'ebs_mount-vol_array/ubuntu2404' => '',
1214
'ebs_mount-vol_array/rocky8' => '',
15+
'ebs_mount-vol_array/rocky9' => '',
1316
'ebs_unmount-vol_array/alinux2' => '',
17+
'ebs_unmount-vol_array/alinux2023' => '',
1418
'ebs_unmount-vol_array/rhel8' => '',
15-
'ebs_unmount-vol_array/centos7' => '',
19+
'ebs_unmount-vol_array/rhel9' => '',
1620
'ebs_unmount-vol_array/ubuntu2004' => '',
1721
'ebs_unmount-vol_array/ubuntu2204' => '',
22+
'ebs_unmount-vol_array/ubuntu2404' => '',
1823
'ebs_unmount-vol_array/rocky8' => '',
24+
'ebs_unmount-vol_array/rocky9' => '',
1925
'raid_mount-raid_vol_array/alinux2' => '',
26+
'raid_mount-raid_vol_array/alinux2023' => '',
2027
'raid_mount-raid_vol_array/rhel8' => '',
21-
'raid_mount-raid_vol_array/centos7' => '',
28+
'raid_mount-raid_vol_array/rhel9' => '',
2229
'raid_mount-raid_vol_array/ubuntu2004' => '',
2330
'raid_mount-raid_vol_array/ubuntu2204' => '',
31+
'raid_mount-raid_vol_array/ubuntu2404' => '',
2432
'raid_mount-raid_vol_array/rocky8' => '',
33+
'raid_mount-raid_vol_array/rocky9' => '',
2534
'raid_unmount-raid_vol_array/alinux2' => '',
35+
'raid_unmount-raid_vol_array/alinux2023' => '',
2636
'raid_unmount-raid_vol_array/rhel8' => '',
27-
'raid_unmount-raid_vol_array/centos7' => '',
37+
'raid_unmount-raid_vol_array/rhel9' => '',
2838
'raid_unmount-raid_vol_array/ubuntu2004' => '',
2939
'raid_unmount-raid_vol_array/ubuntu2204' => '',
40+
'raid_unmount-raid_vol_array/ubuntu2404' => '',
3041
'raid_unmount-raid_vol_array/rocky8' => '',
42+
'raid_unmount-raid_vol_array/rocky9' => '',
3143
'lustre_mount-fsx_fs_id_array' => ["fs-0ab11b3ade43091fe"],
3244
'lustre_mount-fsx_dns_name_array' => ["fs-0ab11b3ade43091fe.fsx.us-west-2.amazonaws.com"],
3345
'lustre_mount-fsx_mount_name_array' => ["qz5b7bev"],

0 commit comments

Comments
 (0)