Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat) - Add Ubuntu-24.04 to matrix_from_metadata v2 and v3 #577

Merged
merged 1 commit into from
Oct 25, 2024
Merged

(feat) - Add Ubuntu-24.04 to matrix_from_metadata v2 and v3 #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions exe/matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
},
"Ubuntu": {
"20.04": { "x86_64": "ubuntu-2004-lts" },
"22.04": { "x86_64": "ubuntu-2204-lts", "arm": "ubuntu-2204-lts-arm64" }
"22.04": { "x86_64": "ubuntu-2204-lts", "arm": "ubuntu-2204-lts-arm64" },
"24.04": { "x86_64": "ubuntu-2404-lts", "arm": "ubuntu-2404-lts-arm64" }
},
"Windows": {
"2016": { "x86_64": "windows-2016" },
Expand Down Expand Up @@ -82,7 +83,8 @@
"Ubuntu": {
"18.04": { "x86_64": "litmusimage/ubuntu:18.04" },
"20.04": { "x86_64": "litmusimage/ubuntu:20.04" },
"22.04": { "x86_64": "litmusimage/ubuntu:22.04" }
"22.04": { "x86_64": "litmusimage/ubuntu:22.04" },
"24.04": { "x86_64": "litmusimage/ubuntu:24.04" }
}
}
},
Expand Down
9 changes: 6 additions & 3 deletions exe/matrix_from_metadata_v2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ IMAGE_TABLE = {
ARM_IMAGE_TABLE = {
'Debian-12-arm' => 'debian-12-arm64',
'RedHat-9-arm' => 'rhel-9-arm64',
'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64'
'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64',
'Ubuntu-24.04-arm' => 'ubuntu-2404-lts-arm64'
}.freeze

DOCKER_PLATFORMS = {
Expand All @@ -60,7 +61,8 @@ DOCKER_PLATFORMS = {
'Scientific-7' => 'litmusimage/scientificlinux:7',
'Ubuntu-18.04' => 'litmusimage/ubuntu:18.04',
'Ubuntu-20.04' => 'litmusimage/ubuntu:20.04',
'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04'
'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04',
'Ubuntu-24.04' => 'litmusimage/ubuntu:24.04'
}.freeze

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