cem_acpt 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d059ce2fbf022d431d61c48d54b20e3b7ded34912c431c646e23886ca4b27e
-  data.tar.gz: 65e50ed28c0fb2884fa3e336e499e2eba9ad3f883cf238c86b0b2a01d8a52623
+  metadata.gz: 0670fc107d34a475c456d55ee179f24488d862e24ca3eb58b1645bf994ebc216
+  data.tar.gz: e39cb29afd796dea81395ab17cc6bf6107202221a0ac1e927e5bdad256db6a61
 SHA512:
-  metadata.gz: 67e2180ae47a96d4563d650787498816d448e60fcb101031cbe3c00c4d7ceafa9fe8101f1ea7c4c9195eea665a7bbbc3295fc5d17ea3d0e97637bb92ec15a476
-  data.tar.gz: fa47ea0174cbcba601d9caaa09001c616c69cf845f0fce346b1ae16c3e503b97387a9ba02965d2fbcad9b9211a8711aedde7d138ad5a5b1aa3983a272a49ece2
+  metadata.gz: b4718840a0a1802a3b08ee469fd8857e6a6e5bbc4c26cf5902793d6e7e0eb5bae7efe781e8f354ad28edd951605c1270bee07f187e00532cb07ee3131e3f98ab
+  data.tar.gz: d9267e9d122d925f4384c638141f25be84a22a036fc60c4ad1319dacb302daafd144e04cc7dacf495f0d607f84ab401f6b4190006184cdcf967034ced6e70b54

data/lib/cem_acpt/image_builder/provision_commands.rb

@@ -97,10 +97,22 @@ module CemAcpt
       end
 
       class DebianFamily
-        def initialize(config, image_name, base_image, os_major_version, puppet_version)
+        CODENAME_MAP = {
+          'ubuntu' => {
+            '2004' => 'focal',
+            '2204' => 'jammy',
+            '2404' => 'noble',
+          },
+          'debian' => {
+            '12' => 'bookworm',
+          },
+        }.freeze
+
+        def initialize(config, image_name, base_image, os_major_version, puppet_version, os: 'ubuntu')
           @config = config
           @image_name = image_name
           @base_image = base_image
+          @os = os
           @os_major_version = os_major_version
           @puppet_version = puppet_version
         end
@@ -121,8 +133,16 @@ module CemAcpt
 
         private
 
+        def apt_codename
+          CODENAME_MAP.dig(@os, @os_major_version) || 'focal'
+        end
+
+        def noninteractive?
+          (@os == 'ubuntu' && @os_major_version.to_i > 2004) || @os == 'debian'
+        end
+
         def upgrade_packages_command
-          if @os_major_version.to_i > 2004
+          if noninteractive?
             'sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=1 NEEDRESTART_MODE=a apt-get update &&'\
             ' sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=1 NEEDRESTART_MODE=a apt-get upgrade -y'
           else
@@ -146,15 +166,15 @@ module CemAcpt
 
         # Update to the new private Puppet platform repository URL for apt
         def puppet_platform_repository_url
-          "https://apt-puppetcore.puppet.com/public/puppet#{@puppet_version}-release-focal.deb"
+          "https://apt-puppetcore.puppet.com/public/puppet#{@puppet_version}-release-#{apt_codename}.deb"
         end
 
         def enable_puppet_repository_command
-          "wget --content-disposition #{puppet_platform_repository_url} && sudo dpkg -i puppet#{@puppet_version}-release-focal.deb"
+          "wget --content-disposition #{puppet_platform_repository_url} && sudo dpkg -i puppet#{@puppet_version}-release-#{apt_codename}.deb"
         end
 
         def install_puppet_agent_command
-          if @os_major_version.to_i > 2004
+          if noninteractive?
             'sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=1 NEEDRESTART_MODE=a apt-get install -y puppet-agent'
           else
             'sudo apt-get install -y puppet-agent'
@@ -175,6 +195,7 @@ module CemAcpt
           'oel' => 'EnterpriseLinuxFamily',
           'rocky' => 'EnterpriseLinuxFamily',
           'ubuntu' => 'DebianFamily',
+          'debian' => 'DebianFamily',
           'windows' => 'WindowsFamily',
         }.freeze
 
@@ -184,7 +205,12 @@ module CemAcpt
           cmd_klass = OS_CLASS_MAP[os.to_s]
           raise "Unsupported OS: #{os}" unless cmd_klass
 
-          const_get(cmd_klass).new(config, image_name, base_image, os_major_version, puppet_version).provision_commands
+          klass = const_get(cmd_klass)
+          if klass == DebianFamily
+            klass.new(config, image_name, base_image, os_major_version, puppet_version, os: os.to_s).provision_commands
+          else
+            klass.new(config, image_name, base_image, os_major_version, puppet_version).provision_commands
+          end
         end
       end
     end

data/lib/cem_acpt/provision/terraform/linux.rb

@@ -10,11 +10,11 @@ module CemAcpt
       GOSS_DOWNLOAD_URL = "https://github.com/goss-org/goss/releases/download/#{GOSS_VERSION}/goss-linux-amd64"
 
       def self.valid_names
-        %w[centos rhel oel alma rocky ubuntu]
+        %w[centos rhel oel alma rocky ubuntu debian]
       end
 
       def self.valid_versions
-        %w[7 8 9 10 2004 2204 2404]
+        %w[7 8 9 10 12 2004 2204 2404]
       end
 
       def systemd_files
@@ -91,7 +91,7 @@ module CemAcpt
             'sudo dnf upgrade -y dnf',
           ]
           (commands << base).flatten
-        elsif image_name.include?('ubuntu')
+        elsif image_name.include?('ubuntu') || image_name.include?('debian')
           commands = ['sudo apt purge -y unattended-upgrades', 'sudo apt-get update -y']
           (commands << base).flatten
         else

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.12.3'
+  VERSION = '0.12.4'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - puppetlabs
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -358,7 +357,6 @@ metadata:
   homepage_uri: https://github.com/puppetlabs/cem_acpt
   source_code_uri: https://github.com/puppetlabs/cem_acpt
   changelog_uri: https://github.com/puppetlabs/cem_acpt
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -373,8 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: CEM Acceptance Tests
 test_files: []