puppet_metadata 0.4.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b930530ef333350feba4aff3093f9629293280fc03f007b0cc5d1236f4b4e9
-  data.tar.gz: 4937ff7c9ae29363e548ae246578a6400bbf69690a4a9eb34dcb73d55ce41002
+  metadata.gz: a51387ced797e16745c927b7a839fc3192ff47fc7269a0729ccf5ebebfe85bb6
+  data.tar.gz: 9d0187e002a2cbc5d90c080405370efb979bdd2a3eec1be295c9567ab20639cb
 SHA512:
-  metadata.gz: 5eebec460da1fef928f71f4c3e2c94e55a138ad060c819046df8ee7b0bdce0d916c2b406f7e1e9e431f7c41e93a91b2950cabd06ddaca4f2896c60a2f3152f05
-  data.tar.gz: 835e8778b6d21ad36a74953c78e66ab93d2c828ce9b7b5088a7d795ee323749834f22245ea1e41873046b7b74c53f3b04b63d8d33d2415113e7deb46aff9b315
+  metadata.gz: 73b3e503a1331f92f98a4b0ebcf9c6fa5c69474edee3cdecafd2899647728d40b8494802042c02422cfdbdee33a7573cd1d1c0dba7443ccae14ecf0031d43433
+  data.tar.gz: 3201c83529d017649552d63833e774971692cb59d0eca654e59bd08265f0287a08da5f3b994f1e9ad72e14e1b50cfd9a3959950cee3056c433ccc0988400e441

data/lib/puppet_metadata/aio.rb

@@ -0,0 +1,68 @@
+module PuppetMetadata
+  class AIO
+    COMPATIBLE = {
+      'AlmaLinux'   => 'RedHat',
+      'Amazon'      => 'RedHat',
+      'CentOS'      => 'RedHat',
+      'OracleLinux' => 'RedHat',
+      'Rocky'       => 'RedHat',
+      'Scientific'  => 'RedHat',
+    }.freeze
+
+    BUILDS = {
+      # RPM-based
+      'RedHat' => {
+        '5' => 5..7,
+        '6' => 5..7,
+        '7' => 5..7,
+        '8' => 5..7,
+      },
+      'Fedora' => {
+        '26' => [5],
+        '27' => 5..6,
+        '28' => 5..6,
+        '29' => 5..6,
+        '30' => 5..7,
+        '31' => 5..7,
+        '32' => 6..7,
+        '34' => 6..7,
+      },
+      'SLES' => {
+        '11' => [7],
+        '12' => [7],
+        '15' => [7],
+      },
+      # deb-based
+      'Debian' => {
+        '7' => [5],
+        '8' => 5..6,
+        '9' => 5..7,
+        '10' => 5..7,
+        '11' => 6..7,
+      },
+      'Ubuntu' => {
+        '14.04' => 5..6,
+        '16.04' => 5..7,
+        '18.04' => 5..7,
+        '20.04' => 6..7,
+      },
+    }.freeze
+
+    PUPPET_RUBY_VERSIONS = {
+      4 => '2.1',
+      5 => '2.4',
+      6 => '2.5',
+      7 => '2.7',
+    }.freeze
+
+    class << self
+      def find_base_os(os)
+        COMPATIBLE.fetch(os, os)
+      end
+
+      def has_aio_build?(os, release, puppet_version)
+        BUILDS.dig(find_base_os(os), release)&.include?(puppet_version)
+      end
+    end
+  end
+end

data/lib/puppet_metadata/beaker.rb

@@ -4,62 +4,79 @@ module PuppetMetadata
   # @see https://rubygems.org/gems/beaker
   # @see https://rubygems.org/gems/beaker-hostgenerator
   class Beaker
-    # Convert an Operating System name with a release to a Beaker setfile
-    #
-    # @param [String] os
-    #   The Operating System string as metadata.json knows it, which in turn is
-    #   based on Facter's operatingsystem fact.
-    # @param [String] release The OS release
-    # @param [Boolean] use_fqdn
-    #   Whether or not to use a FQDN, ensuring a domain
-    # @param [Boolean, Array[String]] pidfile_workaround
-    #   Whether or not to apply the systemd PIDFile workaround. This is only
-    #   needed when the daemon uses PIDFile in its service file and using
-    #   Docker as a Beaker hypervisor. This is to work around Docker's
-    #   limitations.
-    #   When a boolean, it's applied on applicable operating systems. On arrays
-    #   it's applied only when os is included in the provided array.
-    #
-    # @return [nil] If no setfile is available
-    # @return [Array<(String, String)>] The beaker setfile description with a readable name
-    def self.os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false)
-      return unless os_supported?(os)
+    # These images have an older systemd, which they work with
+    # PIDFile parameter
+    PIDFILE_COMPATIBLE_IMAGES = {
+      'CentOS' => {
+        '7' => 'centos:7.6.1810',
+      },
+      'Ubuntu' => {
+        '16.04' => 'ubuntu:xenial-20191212',
+      },
+    }.freeze
 
-      name = "#{os.downcase}#{release.tr('.', '')}-64"
+    # There is no CentOS 8 image that works with PIDFile in systemd
+    # unit files
+    PIDFILE_INCOMPATIBLE = {
+      'CentOS' => ['8'],
+    }.freeze
+    class << self
+      # Convert an Operating System name with a release to a Beaker setfile
+      #
+      # @param [String] os
+      #   The Operating System string as metadata.json knows it, which in turn is
+      #   based on Facter's operatingsystem fact.
+      # @param [String] release The OS release
+      # @param [Boolean] use_fqdn
+      #   Whether or not to use a FQDN, ensuring a domain
+      # @param [Boolean, Array[String]] pidfile_workaround
+      #   Whether or not to apply the systemd PIDFile workaround. This is only
+      #   needed when the daemon uses PIDFile in its service file and using
+      #   Docker as a Beaker hypervisor. This is to work around Docker's
+      #   limitations.
+      #   When a boolean, it's applied on applicable operating systems. On arrays
+      #   it's applied only when os is included in the provided array.
+      #
+      # @return [nil] If no setfile is available
+      # @return [Array<(String, String)>] The beaker setfile description with a readable name
+      def os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false)
+        return unless os_supported?(os)
 
-      options = {}
-      options[:hostname] = "#{name}.example.com" if use_fqdn
+        name = "#{os.downcase}#{release.tr('.', '')}-64"
 
-      # Docker messes up cgroups and modern systemd can't deal with that when
-      # PIDFile is used.
-      if pidfile_workaround && (!pidfile_workaround.is_a?(Array) || pidfile_workaround.include?(os))
-        case os
-        when 'CentOS'
-          case release
-          when '7'
-            options[:image] = 'centos:7.6.1810'
-          when '8'
-            # There is no CentOS 8 image that works with PIDFile in systemd
-            # unit files
-            return
+        options = {}
+        options[:hostname] = "#{name}.example.com" if use_fqdn
+
+        # Docker messes up cgroups and modern systemd can't deal with that when
+        # PIDFile is used.
+        if pidfile_workaround?(pidfile_workaround, os)
+          return if PIDFILE_INCOMPATIBLE[os]&.include?(release)
+
+          if (image = PIDFILE_COMPATIBLE_IMAGES.dig(os, release))
+            options[:image] = image
           end
-        when 'Ubuntu'
-          options[:image] = 'ubuntu:xenial-20191212' if release == '16.04'
         end
+
+        human_name = "#{os} #{release}"
+
+        [build_setfile(name, options), human_name]
       end
 
-      setfile = name
-      setfile += "{#{options.map { |key, value| "#{key}=#{value}" }.join(',')}}" if options.any?
+      # Return whether a Beaker setfile can be generated for the given OS
+      # @param [String] os The operating system
+      def os_supported?(os)
+        ['CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
+      end
 
-      human_name = "#{os} #{release}"
+      private
 
-      [setfile, human_name]
-    end
+      def pidfile_workaround?(pidfile_workaround, os)
+        pidfile_workaround && (!pidfile_workaround.is_a?(Array) || pidfile_workaround.include?(os))
+      end
 
-    # Return whether a Beaker setfile can be generated for the given OS
-    # @param [String] os The operating system
-    def self.os_supported?(os)
-      ['CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
+      def build_setfile(name, options)
+        "#{name}#{options.any? ? "{#{options.map { |key, value| "#{key}=#{value}" }.join(',')}}" : ''}"
+      end
     end
   end
 end

data/lib/puppet_metadata/github_actions.rb

@@ -13,6 +13,7 @@ module PuppetMetadata
         beaker_setfiles: beaker_setfiles(beaker_use_fqdn, beaker_pidfile_workaround),
         puppet_major_versions: puppet_major_versions,
         puppet_unit_test_matrix: puppet_unit_test_matrix,
+        github_action_test_matrix: github_action_test_matrix(use_fqdn: beaker_use_fqdn, pidfile_workaround: beaker_pidfile_workaround),
       }
     end
 
@@ -41,7 +42,7 @@ module PuppetMetadata
 
     def puppet_unit_test_matrix
       metadata.puppet_major_versions.sort.reverse.map do |puppet|
-        ruby = puppet_ruby_version(puppet)
+        ruby = PuppetMetadata::AIO::PUPPET_RUBY_VERSIONS[puppet]
         next unless ruby
 
         {
@@ -51,16 +52,24 @@ module PuppetMetadata
       end.compact
     end
 
-    def puppet_ruby_version(puppet_version)
-      case puppet_version
-      when 4
-        '2.1'
-      when 5
-        '2.4'
-      when 6
-        '2.5'
-      when 7
-        '2.7'
+    def github_action_test_matrix(use_fqdn: false, pidfile_workaround: false)
+      metadata.operatingsystems.each_with_object([]) do |(os, releases), matrix_include|
+        releases&.each do |release|
+          puppet_major_versions.each do |puppet_version|
+            next unless AIO.has_aio_build?(os, release, puppet_version[:value])
+
+            setfile = PuppetMetadata::Beaker.os_release_to_setfile(os, release, use_fqdn: use_fqdn, pidfile_workaround: pidfile_workaround)
+            next unless setfile
+
+            matrix_include << {
+              setfile: {
+                name: setfile[1],
+                value: setfile[0],
+              },
+              puppet: puppet_version
+            }
+          end
+        end
       end
     end
   end

data/lib/puppet_metadata/operatingsystem.rb

@@ -22,9 +22,10 @@ module PuppetMetadata
       # https://wiki.debian.org/DebianReleases
       'Debian' => {
         # TODO: EOL is standard support, not the extended life cycle
+        '11' => nil, # '~2024',
         '10' => nil, # '~2022',
-        '9' => nil, # '~2020',
-        '8' => '2018-06-06',
+        '9' => '2020-07-06',
+        '8' => '2018-06-17',
         '7' => '2016-04-26',
         '6' => '2015-05-31',
         '5' => '2012-02-06',
@@ -113,47 +114,49 @@ module PuppetMetadata
         '5.04' => '2006-10-31',
         '4.10' => '2006-04-30',
       },
-    }
+    }.freeze
 
-    # Return the EOL date for the given operating system release
-    # @param [String] operatingsystem
-    #   The operating system
-    # @param [String] release
-    #   The major version of the operating system
-    # @return [optional, Date]
-    #   The EOL date for the given operating system release. Nil is returned
-    #   when the either when the OS, the release or the EOL date is unknown
-    def self.eol_date(operatingsystem, release)
-      releases = EOL_DATES[operatingsystem]
-      return unless releases
-      date = releases[release]
-      return unless date
-      Date.parse(date)
-    end
+    class << self
+      # Return the EOL date for the given operating system release
+      # @param [String] operatingsystem
+      #   The operating system
+      # @param [String] release
+      #   The major version of the operating system
+      # @return [optional, Date]
+      #   The EOL date for the given operating system release. Nil is returned
+      #   when the either when the OS, the release or the EOL date is unknown
+      def eol_date(operatingsystem, release)
+        releases = EOL_DATES[operatingsystem]
+        return unless releases
+        date = releases[release]
+        return unless date
+        Date.parse(date)
+      end
 
-    # Return whether the given operating system release is EOL at the given
-    # date
-    #
-    # @param [String] operatingsystem
-    #   The operating system
-    # @param [String] release
-    #   The major version of the operating system
-    # @return [Boolean]
-    #   The EOL date for the given operating system release. Nil is returned
-    #   when the either when the OS, the release or the EOL date is unknown
-    def self.eol?(operatingsystem, release, at = nil)
-      date = eol_date(operatingsystem, release)
-      date && date < (at || Date.today)
-    end
+      # Return whether the given operating system release is EOL at the given
+      # date
+      #
+      # @param [String] operatingsystem
+      #   The operating system
+      # @param [String] release
+      #   The major version of the operating system
+      # @return [Boolean]
+      #   The EOL date for the given operating system release. Nil is returned
+      #   when the either when the OS, the release or the EOL date is unknown
+      def eol?(operatingsystem, release, at = nil)
+        date = eol_date(operatingsystem, release)
+        date && date < (at || Date.today)
+      end
 
-    # Return the latest known release for a given operating system
-    # @param [String] operatingsystem The operating system
-    # @return [optional, String]
-    #   The latest major release for the given operating system, if any is
-    #   known
-    def self.latest_release(operatingsystem)
-      releases = EOL_DATES[operatingsystem]
-      releases&.keys&.max_by { |release| Gem::Version.new(release) }
+      # Return the latest known release for a given operating system
+      # @param [String] operatingsystem The operating system
+      # @return [optional, String]
+      #   The latest major release for the given operating system, if any is
+      #   known
+      def latest_release(operatingsystem)
+        releases = EOL_DATES[operatingsystem]
+        releases&.keys&.max_by { |release| Gem::Version.new(release) }
+      end
     end
   end
 end

data/lib/puppet_metadata.rb

@@ -1,5 +1,6 @@
 # A module that provides abstractions around Puppet's metadata format.
 module PuppetMetadata
+  autoload :AIO, 'puppet_metadata/aio'
   autoload :Beaker, 'puppet_metadata/beaker'
   autoload :GithubActions, 'puppet_metadata/github_actions'
   autoload :Metadata, 'puppet_metadata/metadata'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
@@ -127,6 +127,7 @@ files:
 - README.md
 - bin/metadata2gha
 - lib/puppet_metadata.rb
+- lib/puppet_metadata/aio.rb
 - lib/puppet_metadata/beaker.rb
 - lib/puppet_metadata/github_actions.rb
 - lib/puppet_metadata/metadata.rb