Merge pull request #571 from puppetlabs/CAT-2101

(CAT-2101) Add support for Debian-12
puppetlabs · Nov 19, 2024 · 0e51bb3 · 0e51bb3
2 parents c59c55b + b5e40f8
commit 0e51bb3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -7,7 +7,7 @@ fixtures:
     facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
     puppet_agent:
       repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-      ref: v4.13.0
+      ref: v4.21.0
     provision: 'https://github.com/puppetlabs/provision.git'
 
   symlinks:

diff --git a/metadata.json b/metadata.json
@@ -53,7 +53,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {

diff --git a/spec/acceptance/acceptance_1b_spec.rb b/spec/acceptance/acceptance_1b_spec.rb
@@ -18,6 +18,8 @@
 
       if os[:release].start_with?('9')
         "/usr/lib/jvm/java-8-openjdk-#{architecture}"
+      elsif os[:release].start_with?('12')
+        "/usr/lib/jvm/java-17-openjdk-#{architecture}"
       else
         "/usr/lib/jvm/java-11-openjdk-#{architecture}"
       end
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,8 @@ @@
           "operatingsystem": "Debian",
           "operatingsystemrelease": [
             "10",
-            "11"
+            "11",
+            "12"
           ]
         },
         {
@@ Expand Down @@