Skip to content

Commit f9a1b6f

Browse files
author
Himani Anil Deshpande
committed
Adding Rocky9, rhel9 and al2023
1 parent 9747b23 commit f9a1b6f

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +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-
ubuntu2404 = os_properties.ubuntu2404?
26-
keyring = (ubuntu2004 || ubuntu2204 || ubuntu2404) && !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' : ''
2725
sudo = os_properties.redhat_on_docker? ? '' : 'sudo'
2826
describe bash("#{sudo} gpg --list-keys #{keyring}") do
2927
# Don't check exit status for Ubuntu20 because it returns 2 when executed in the validate phase of a created AMI
3028
# os_properties cannot be used in the describe block level. It can be used within an it{} block
31-
its('exit_status') { should eq 0 } unless ubuntu2004 || ubuntu2204
29+
its('exit_status') { should eq 0 } unless os_properties.ubuntu?
3230
its('stdout') { should match /3B789C72/ }
3331
its('stdout') { should match /Amazon CloudWatch Agent/ }
3432
end

test/environments/kitchen.rb

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +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' => '',
1213
'ebs_mount-vol_array/ubuntu2404' => '',
1314
'ebs_mount-vol_array/rocky8' => '',
15+
'ebs_mount-vol_array/rocky9' => '',
1416
'ebs_unmount-vol_array/alinux2' => '',
17+
'ebs_unmount-vol_array/alinux2023' => '',
1518
'ebs_unmount-vol_array/rhel8' => '',
16-
'ebs_unmount-vol_array/centos7' => '',
19+
'ebs_unmount-vol_array/rhel9' => '',
1720
'ebs_unmount-vol_array/ubuntu2004' => '',
1821
'ebs_unmount-vol_array/ubuntu2204' => '',
1922
'ebs_unmount-vol_array/ubuntu2404' => '',
2023
'ebs_unmount-vol_array/rocky8' => '',
24+
'ebs_unmount-vol_array/rocky9' => '',
2125
'raid_mount-raid_vol_array/alinux2' => '',
26+
'raid_mount-raid_vol_array/alinux2023' => '',
2227
'raid_mount-raid_vol_array/rhel8' => '',
23-
'raid_mount-raid_vol_array/centos7' => '',
28+
'raid_mount-raid_vol_array/rhel9' => '',
2429
'raid_mount-raid_vol_array/ubuntu2004' => '',
2530
'raid_mount-raid_vol_array/ubuntu2204' => '',
2631
'raid_mount-raid_vol_array/ubuntu2404' => '',
2732
'raid_mount-raid_vol_array/rocky8' => '',
33+
'raid_mount-raid_vol_array/rocky9' => '',
2834
'raid_unmount-raid_vol_array/alinux2' => '',
35+
'raid_unmount-raid_vol_array/alinux2023' => '',
2936
'raid_unmount-raid_vol_array/rhel8' => '',
30-
'raid_unmount-raid_vol_array/centos7' => '',
37+
'raid_unmount-raid_vol_array/rhel9' => '',
3138
'raid_unmount-raid_vol_array/ubuntu2004' => '',
3239
'raid_unmount-raid_vol_array/ubuntu2204' => '',
3340
'raid_unmount-raid_vol_array/ubuntu2404' => '',
3441
'raid_unmount-raid_vol_array/rocky8' => '',
42+
'raid_unmount-raid_vol_array/rocky9' => '',
3543
'lustre_mount-fsx_fs_id_array' => ["fs-0ab11b3ade43091fe"],
3644
'lustre_mount-fsx_dns_name_array' => ["fs-0ab11b3ade43091fe.fsx.us-west-2.amazonaws.com"],
3745
'lustre_mount-fsx_mount_name_array' => ["qz5b7bev"],

0 commit comments

Comments
 (0)