Skip to content

Commit ed39d23

Browse files
Merge pull request #572 from puppetlabs/feat-add_supported_platforms
(FEAT) - Add debian 12 & alma/centos/rocky 9 to matrix_from_metadata v2 & v3
2 parents d0bd6a9 + a595898 commit ed39d23

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

exe/matrix.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,22 @@
1212
"provisioners": {
1313
"provision_service": {
1414
"AlmaLinux": {
15-
"8": { "x86_64": "almalinux-cloud/almalinux-8" }
15+
"8": { "x86_64": "almalinux-cloud/almalinux-8" },
16+
"9": { "x86_64": "almalinux-cloud/almalinux-9" }
1617
},
1718
"CentOS": {
1819
"7": { "x86_64": "centos-7" },
19-
"8": { "x86_64": "centos-stream-8" }
20+
"8": { "x86_64": "centos-stream-8" },
21+
"9": { "x86_64": "centos-stream-9" }
2022
},
2123
"Rocky": {
22-
"8": { "x86_64": "rocky-linux-cloud/rocky-linux-8" }
24+
"8": { "x86_64": "rocky-linux-cloud/rocky-linux-8" },
25+
"9": { "x86_64": "rocky-linux-cloud/rocky-linux-9" }
2326
},
2427
"Debian": {
2528
"10": { "x86_64": "debian-10" },
26-
"11": { "x86_64": "debian-11" }
29+
"11": { "x86_64": "debian-11" },
30+
"12": { "x86_64": "debian-12", "arm": "debian-12-arm64" }
2731
},
2832
"RedHat": {
2933
"7": { "x86_64": "rhel-7" },

exe/matrix_from_metadata_v2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ IMAGE_TABLE = {
3636
}.freeze
3737

3838
ARM_IMAGE_TABLE = {
39+
'Debian-12-arm' => 'debian-12-arm64',
3940
'RedHat-9-arm' => 'rhel-9-arm64',
4041
'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64'
4142
}.freeze
@@ -108,11 +109,15 @@ if ARGV.include?('--provision-service')
108109
# NOTE: that the below are the only available images for the provision service
109110
updated_platforms = {
110111
'AlmaLinux-8' => 'almalinux-cloud/almalinux-8',
112+
'AlmaLinux-9' => 'almalinux-cloud/almalinux-9',
111113
'CentOS-7' => 'centos-7',
112114
'CentOS-8' => 'centos-stream-8',
115+
'CentOS-9' => 'centos-stream-9',
113116
'Rocky-8' => 'rocky-linux-cloud/rocky-linux-8',
117+
'Rocky-9' => 'rocky-linux-cloud/rocky-linux-9',
114118
'Debian-10' => 'debian-10',
115119
'Debian-11' => 'debian-11',
120+
'Debian-12' => 'debian-12',
116121
'Ubuntu-20.04' => 'ubuntu-2004-lts',
117122
'Ubuntu-22.04' => 'ubuntu-2204-lts'
118123
}

0 commit comments

Comments
 (0)