puppet_metadata 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41190de113b3a8b9f44f2f627fe9f67c1dcfc9886d674b69287f1adbef9ce06
-  data.tar.gz: 1bb3c2e083ae08867f9baf04e901f1271f0d5f4b8bb088e74db6b1004062a572
+  metadata.gz: 6592e846ac0678664a4f88091a19002df675cbbf06d51159a0a54e9e68573ae7
+  data.tar.gz: c5975198c75b77e682c8ce263f0b2279f77bbb2df1fb941f5809b909416cf003
 SHA512:
-  metadata.gz: 18f0597d9195fe59dbc21e719a65d4e251a67e91dc33e4fc6db575b7ab67f26fe21c4f5e1ebcfe86edec63aaad631cf4376b90dda32c4042569bf8cbb91c8d4f
-  data.tar.gz: 3f8f49b5f3a552a22622740bc13a400846b8c0093ec8d2f5987fe5513a6314c924c405d013da6ce7c89879c9502627dcbd952cdb9ba42d39eaa67ad582e64e94
+  metadata.gz: 46c96e7c74f6f2967b0d7a9c3f0568564e5edcca10f0b57a4652edea19b33d6adad589971cb6141cbab0864eadd58a450554b540fd318bd22717d80e634f6060
+  data.tar.gz: c7a6da54b846424e3122206c6d6908dd8e4716450c7b79e1529a96df24e376a95c77a04cb73bc40519b5e901da43e08857a061cac0687e83b20da1284ff40565

data/bin/metadata2gha

@@ -10,6 +10,7 @@ options = {
   beaker_pidfile_workaround: false,
   domain: nil,
   minimum_major_puppet_version: nil,
+  beaker_fact: nil,
 }
 
 OptionParser.new do |opts|
@@ -30,6 +31,15 @@ OptionParser.new do |opts|
   opts.on('--pidfile-workaround VALUE', 'Generate the systemd PIDFile workaround to work around a docker bug', PidfileWorkaround) { |opt| options[:beaker_pidfile_workaround] = opt }
   opts.on('-d', '--domain VALUE', 'the domain for the box, only used when --use-fqdn is set to true') { |opt| options[:domain] = opt }
   opts.on('--minimum-major-puppet-version VERSION', "Don't create actions for Puppet versions less than this major version") { |opt| options[:minimum_major_puppet_version] = opt }
+  opts.on('--beaker-facter FACT:LABEL:VALUES', 'Expand the matrix based on a fact. Separate values using commas') do |opt|
+    if opt != 'false'
+      fact, label, values = opt.split(':', 3)
+      label = fact if !label || label.empty?
+      raise OptionParser::InvalidArgument unless values
+
+      options[:beaker_facter] = [fact, label, values.split(',')]
+    end
+  end
 end.parse!
 
 filename = ARGV[0]

data/lib/puppet_metadata/github_actions.rb

@@ -14,6 +14,8 @@ module PuppetMetadata
       {
         puppet_major_versions: puppet_major_versions,
         puppet_unit_test_matrix: puppet_unit_test_matrix,
+        puppet_beaker_test_matrix: puppet_beaker_test_matrix,
+        # Deprecated
         github_action_test_matrix: github_action_test_matrix,
       }
     end
@@ -61,8 +63,10 @@ module PuppetMetadata
         else
           releases&.each do |release|
             majors.each do |puppet_version|
-              if AIO.has_aio_build?(os, release, puppet_version[:value]) # rubocop:disable Style/IfUnlessModifier
+              if AIO.has_aio_build?(os, release, puppet_version[:value])
                 yield [os, release, puppet_version]
+              elsif PuppetMetadata::OperatingSystem.os_release_puppet_version(os, release) == puppet_version[:value]
+                yield [os, release, distro_puppet_version.merge(value: puppet_version[:value])]
               end
             end
           end
@@ -70,16 +74,49 @@ module PuppetMetadata
       end
     end
 
-    def github_action_test_matrix
+    def puppet_beaker_test_matrix
       matrix_include = []
 
       beaker_os_releases do |os, release, puppet_version|
-        setfile = PuppetMetadata::Beaker.os_release_to_setfile(
-          os, release, use_fqdn: options[:beaker_use_fqdn], pidfile_workaround: options[:beaker_pidfile_workaround], domain: options[:domain], puppet_version: puppet_version[:collection]
-        )
+        next if puppet_version_below_minimum?(puppet_version[:value])
+
+        setfile = os_release_to_beaker_setfile(os, release, puppet_version[:collection])
         next unless setfile
+
+        name = "#{puppet_version[:name]} - #{setfile[1]}"
+        env = {
+          'BEAKER_PUPPET_COLLECTION' => puppet_version[:collection],
+          'BEAKER_SETFILE' => setfile[0],
+        }
+
+        if options[:beaker_facter]
+          fact, label, values = options[:beaker_facter]
+          values.each do |value|
+            matrix_include << {
+              name: "#{name} - #{label || fact} #{value}",
+              env: env.merge("BEAKER_FACTER_#{fact}" => value),
+            }
+          end
+        else
+          matrix_include << {
+            name: name,
+            env: env,
+          }
+        end
+      end
+
+      matrix_include
+    end
+
+    def github_action_test_matrix
+      matrix_include = []
+
+      beaker_os_releases do |os, release, puppet_version|
         next if puppet_version_below_minimum?(puppet_version[:value])
 
+        setfile = os_release_to_beaker_setfile(os, release, puppet_version[:collection])
+        next unless setfile
+
         matrix_include << {
           name: "#{puppet_version[:name]} - #{setfile[1]}",
           setfile: {
@@ -98,5 +135,16 @@ module PuppetMetadata
 
       Gem::Version.new(version) < Gem::Version.new(options[:minimum_major_puppet_version])
     end
+
+    def os_release_to_beaker_setfile(os, release, puppet_collection)
+      PuppetMetadata::Beaker.os_release_to_setfile(
+        os,
+        release,
+        use_fqdn: options[:beaker_use_fqdn],
+        pidfile_workaround: options[:beaker_pidfile_workaround],
+        domain: options[:domain],
+        puppet_version: puppet_collection,
+      )
+    end
   end
 end

data/lib/puppet_metadata/operatingsystem.rb

@@ -32,6 +32,7 @@ module PuppetMetadata
       # https://wiki.debian.org/DebianReleases
       'Debian' => {
         # TODO: EOL is standard support, not the extended life cycle
+        '12' => nil, # '~2026',
         '11' => nil, # '~2024',
         '10' => nil, # '~2022',
         '9' => '2020-07-06',
@@ -206,6 +207,33 @@ module PuppetMetadata
         releases.select { |_release, eol_date| !eol_date || Date.parse(eol_date) > today }.keys
                 .sort_by { |release| Gem::Version.new(release) }
       end
+
+      # Return the Puppet major version in an OS release, if any
+      #
+      # Only tracks releases without an AIO build, since that's preferred.
+      #
+      # @param [String] operatingsystem
+      #   The operating system name
+      # @param [String] release
+      #   The operating system release version
+      #
+      # @return [Optional[Integer]] The Puppet major version, if any
+      def os_release_puppet_version(operatingsystem, release)
+        case operatingsystem
+        when 'Debian'
+          case release
+          when '12'
+            7
+          end
+        when 'Fedora'
+          case release
+          when '39', '40'
+            8
+          when '37', '38'
+            7
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint