Merge pull request #600 from choffee/main

Add support for Ubuntu 24.04
puppetlabs · Dec 13, 2024 · 0e7a20f · 0e7a20f
2 parents 9255a97 + c1e0299
commit 0e7a20f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,5 +17,4 @@ jobs:
     secrets: "inherit"
     with:
       runs_on: "ubuntu-20.04"
-      flags: "--exclude-platforms '[\"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"
-
+      flags: "--exclude-platforms '[\"Ubuntu-24.04-arm\", \"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -16,5 +16,4 @@ jobs:
     secrets: "inherit"
     with:
       runs_on: "ubuntu-20.04"
-      flags: "--exclude-platforms '[\"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"
-
+      flags: "--exclude-platforms '[\"Ubuntu-24.04-arm\", \"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -58,7 +58,7 @@
         default   => $facts['os']['architecture']
       }
       case $facts['os']['release']['major'] {
-        '12': {
+        '12', '24.04': {
           $openjdk = 17
         }
         '10', '11', '18.04', '18.10', '19.04', '19.10', '20.04', '22.04': {

diff --git a/metadata.json b/metadata.json
@@ -52,7 +52,8 @@
       "operatingsystemrelease": [
         "18.04",
         "20.04",
-        "22.04"
+        "22.04",
+        "24.04"
       ]
     },
     {