Skip to content

Commit 9747b23

Browse files
author
Himani Anil Deshpande
committed
Adding Ubuntu24 for kitchen tests for storage
1 parent 57352fe commit 9747b23

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
# In Ubuntu >20.04 due to environment variable the keyring is placed under home of the user ubuntu with the permission of root
2323
ubuntu2004 = os_properties.ubuntu2004?
2424
ubuntu2204 = os_properties.ubuntu2204?
25-
keyring = (ubuntu2004 || ubuntu2204) && !os_properties.on_docker? ? '--keyring /home/ubuntu/.gnupg/pubring.kbx' : ''
25+
ubuntu2404 = os_properties.ubuntu2404?
26+
keyring = (ubuntu2004 || ubuntu2204 || ubuntu2404) && !os_properties.on_docker? ? '--keyring /home/ubuntu/.gnupg/pubring.kbx' : ''
2627
sudo = os_properties.redhat_on_docker? ? '' : 'sudo'
2728
describe bash("#{sudo} gpg --list-keys #{keyring}") do
2829
# Don't check exit status for Ubuntu20 because it returns 2 when executed in the validate phase of a created AMI

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.ubuntu2004? || os_properties.ubuntu2204? || os_properties.ubuntu2404?) && !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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if os_properties.alinux2? || os_properties.centos7?
2020
mysql_packages.concat %w(mysql-community-libs-compat)
2121
end
22-
elsif os_properties.ubuntu2004? || os_properties.ubuntu2204?
22+
elsif os_properties.ubuntu2004? || os_properties.ubuntu2204? || os_properties.ubuntu2404?
2323
mysql_packages.concat %w(libmysqlclient-dev libmysqlclient21)
2424
else
2525
describe "unsupported OS" do

test/environments/kitchen.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,28 @@
99
'ebs_mount-vol_array/centos7' => '',
1010
'ebs_mount-vol_array/ubuntu2004' => '',
1111
'ebs_mount-vol_array/ubuntu2204' => '',
12+
'ebs_mount-vol_array/ubuntu2404' => '',
1213
'ebs_mount-vol_array/rocky8' => '',
1314
'ebs_unmount-vol_array/alinux2' => '',
1415
'ebs_unmount-vol_array/rhel8' => '',
1516
'ebs_unmount-vol_array/centos7' => '',
1617
'ebs_unmount-vol_array/ubuntu2004' => '',
1718
'ebs_unmount-vol_array/ubuntu2204' => '',
19+
'ebs_unmount-vol_array/ubuntu2404' => '',
1820
'ebs_unmount-vol_array/rocky8' => '',
1921
'raid_mount-raid_vol_array/alinux2' => '',
2022
'raid_mount-raid_vol_array/rhel8' => '',
2123
'raid_mount-raid_vol_array/centos7' => '',
2224
'raid_mount-raid_vol_array/ubuntu2004' => '',
2325
'raid_mount-raid_vol_array/ubuntu2204' => '',
26+
'raid_mount-raid_vol_array/ubuntu2404' => '',
2427
'raid_mount-raid_vol_array/rocky8' => '',
2528
'raid_unmount-raid_vol_array/alinux2' => '',
2629
'raid_unmount-raid_vol_array/rhel8' => '',
2730
'raid_unmount-raid_vol_array/centos7' => '',
2831
'raid_unmount-raid_vol_array/ubuntu2004' => '',
2932
'raid_unmount-raid_vol_array/ubuntu2204' => '',
33+
'raid_unmount-raid_vol_array/ubuntu2404' => '',
3034
'raid_unmount-raid_vol_array/rocky8' => '',
3135
'lustre_mount-fsx_fs_id_array' => ["fs-0ab11b3ade43091fe"],
3236
'lustre_mount-fsx_dns_name_array' => ["fs-0ab11b3ade43091fe.fsx.us-west-2.amazonaws.com"],

0 commit comments

Comments
 (0)