Merge pull request #460 from puppetlabs/CAT-2100-add-debian12-support

(CAT-2100) Add Debian 12 support
puppetlabs · Oct 24, 2024 · f83480c · f83480c
2 parents 566df55 + 603ac3b
commit f83480c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -4,7 +4,7 @@ fixtures:
     provision: 'https://github.com/puppetlabs/provision.git'
     puppet_agent:
       repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-      ref: v4.13.0
+      ref: v4.21.0
   forge_modules:
     chocolatey: "puppetlabs/chocolatey"
     java: "puppetlabs/java"

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

diff --git a/spec/acceptance/pkcs12_spec.rb b/spec/acceptance/pkcs12_spec.rb
@@ -51,7 +51,7 @@
       idempotent_apply(pp)
 
       expectations = if os[:family] == 'windows' || (os[:family] == 'ubuntu' && ['20.04', '22.04'].include?(os[:release])) ||
-                        (os[:family] == 'debian' && os[:release] =~ %r{^11})
+                        (os[:family] == 'debian' && os[:release] =~ %r{^11|12})
                        [
                          %r{Alias name: leaf cert},
                          %r{Entry type: (keyEntry|PrivateKeyEntry)},

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
@@ -197,7 +197,7 @@ class { 'java': }
     when 'ubuntu'
       @ensure_ks = 'present' if ['20.04', '22.04'].include?(os[:release])
     when 'debian'
-      @ensure_ks = 'present' if os[:release].match?(%r{^11})
+      @ensure_ks = 'present' if os[:release].match?(%r{^11|12})
     end
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,8 @@ @@
           "operatingsystem": "Debian",
           "operatingsystemrelease": [
             "10",
-            "11"
+            "11",
+            "12"
           ]
         },
         {
@@ Expand Down @@