Merge pull request #572 from puppetlabs/feat-add_supported_platforms

(FEAT) - Add debian 12 & alma/centos/rocky 9 to matrix_from_metadata v2 & v3
puppetlabs · Aug 5, 2024 · ed39d23 · ed39d23
2 parents d0bd6a9 + a595898
commit ed39d23
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/exe/matrix.json b/exe/matrix.json
@@ -12,18 +12,22 @@
  "provisioners": {
  "provision_service": {
  "AlmaLinux": {
- "8": { "x86_64": "almalinux-cloud/almalinux-8" }
+ "8": { "x86_64": "almalinux-cloud/almalinux-8" },
+ "9": { "x86_64": "almalinux-cloud/almalinux-9" }
  },
  "CentOS": {
  "7": { "x86_64": "centos-7" },
- "8": { "x86_64": "centos-stream-8" }
+ "8": { "x86_64": "centos-stream-8" },
+ "9": { "x86_64": "centos-stream-9" }
  },
  "Rocky": {
- "8": { "x86_64": "rocky-linux-cloud/rocky-linux-8" }
+ "8": { "x86_64": "rocky-linux-cloud/rocky-linux-8" },
+ "9": { "x86_64": "rocky-linux-cloud/rocky-linux-9" }
  },
  "Debian": {
  "10": { "x86_64": "debian-10" },
- "11": { "x86_64": "debian-11" }
+ "11": { "x86_64": "debian-11" },
+ "12": { "x86_64": "debian-12", "arm": "debian-12-arm64" }
  },
  "RedHat": {
  "7": { "x86_64": "rhel-7" },

diff --git a/exe/matrix_from_metadata_v2 b/exe/matrix_from_metadata_v2
@@ -36,6 +36,7 @@ IMAGE_TABLE = {
 }.freeze
 
 ARM_IMAGE_TABLE = {
+ 'Debian-12-arm' => 'debian-12-arm64',
  'RedHat-9-arm' => 'rhel-9-arm64',
  'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64'
 }.freeze
@@ -108,11 +109,15 @@ if ARGV.include?('--provision-service')
  # NOTE: that the below are the only available images for the provision service
  updated_platforms = {
  'AlmaLinux-8' => 'almalinux-cloud/almalinux-8',
+ 'AlmaLinux-9' => 'almalinux-cloud/almalinux-9',
  'CentOS-7' => 'centos-7',
  'CentOS-8' => 'centos-stream-8',
+ 'CentOS-9' => 'centos-stream-9',
  'Rocky-8' => 'rocky-linux-cloud/rocky-linux-8',
+ 'Rocky-9' => 'rocky-linux-cloud/rocky-linux-9',
  'Debian-10' => 'debian-10',
  'Debian-11' => 'debian-11',
+ 'Debian-12' => 'debian-12',
  'Ubuntu-20.04' => 'ubuntu-2004-lts',
  'Ubuntu-22.04' => 'ubuntu-2204-lts'
  }