Skip to content

Commit 383b639

Browse files
authored
Merge pull request #577 from puppetlabs/feat-add-ubuntu24
(feat) - Add Ubuntu-24.04 to matrix_from_metadata v2 and v3
2 parents 30d176e + a056cc4 commit 383b639

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

exe/matrix.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
},
4141
"Ubuntu": {
4242
"20.04": { "x86_64": "ubuntu-2004-lts" },
43-
"22.04": { "x86_64": "ubuntu-2204-lts", "arm": "ubuntu-2204-lts-arm64" }
43+
"22.04": { "x86_64": "ubuntu-2204-lts", "arm": "ubuntu-2204-lts-arm64" },
44+
"24.04": { "x86_64": "ubuntu-2404-lts", "arm": "ubuntu-2404-lts-arm64" }
4445
},
4546
"Windows": {
4647
"2016": { "x86_64": "windows-2016" },
@@ -82,7 +83,8 @@
8283
"Ubuntu": {
8384
"18.04": { "x86_64": "litmusimage/ubuntu:18.04" },
8485
"20.04": { "x86_64": "litmusimage/ubuntu:20.04" },
85-
"22.04": { "x86_64": "litmusimage/ubuntu:22.04" }
86+
"22.04": { "x86_64": "litmusimage/ubuntu:22.04" },
87+
"24.04": { "x86_64": "litmusimage/ubuntu:24.04" }
8688
}
8789
}
8890
},

exe/matrix_from_metadata_v2

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ IMAGE_TABLE = {
3838
ARM_IMAGE_TABLE = {
3939
'Debian-12-arm' => 'debian-12-arm64',
4040
'RedHat-9-arm' => 'rhel-9-arm64',
41-
'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64'
41+
'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64',
42+
'Ubuntu-24.04-arm' => 'ubuntu-2404-lts-arm64'
4243
}.freeze
4344

4445
DOCKER_PLATFORMS = {
@@ -60,7 +61,8 @@ DOCKER_PLATFORMS = {
6061
'Scientific-7' => 'litmusimage/scientificlinux:7',
6162
'Ubuntu-18.04' => 'litmusimage/ubuntu:18.04',
6263
'Ubuntu-20.04' => 'litmusimage/ubuntu:20.04',
63-
'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04'
64+
'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04',
65+
'Ubuntu-24.04' => 'litmusimage/ubuntu:24.04'
6466
}.freeze
6567

6668
# This table uses the latest version in each collection for accurate
@@ -119,7 +121,8 @@ if ARGV.include?('--provision-service')
119121
'Debian-11' => 'debian-11',
120122
'Debian-12' => 'debian-12',
121123
'Ubuntu-20.04' => 'ubuntu-2004-lts',
122-
'Ubuntu-22.04' => 'ubuntu-2204-lts'
124+
'Ubuntu-22.04' => 'ubuntu-2204-lts',
125+
'Ubuntu-24.04' => 'ubuntu-2404-lts'
123126
}
124127
updated_list = IMAGE_TABLE.dup.clone
125128
updated_list.merge!(updated_platforms)

0 commit comments

Comments
 (0)