puppet_metadata 1.3.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1812a9565d5558aea69c47b403fd31788417b995ad8c4ef5349ddee10d18529c
-  data.tar.gz: 54dda6a4915469ce27d0d2b9a1c43fbcee5cfdc2314dfc3fa8358afca9d303da
+  metadata.gz: a0aff2535944de382ab5adfa1a57a84fab5baae9e2992368b9eded89224c7a47
+  data.tar.gz: bb47a9cc7523ddb152d272413b9ea34d4383aa973a9ea20f34f62f77ac2ac78e
 SHA512:
-  metadata.gz: 49675f7c180f2300e05c3018cb6d0c9f064d74b5f95fee222d73e7f83c385a8b4a839779462163a11022f9c700d115839c1d79d239a0f5988a1cbf5c3dea344d
-  data.tar.gz: be883a1b3af62b048436c263afd6dc4a0963fc5345d9a8e69f63af96e52f84670c5ec1d63ef212a371ed2044f62e21f2c5a49e9016f0c1c108083a12efbd7a7e
+  metadata.gz: eda06d30d5d6b81014c029540e3218dfe45dd9accf87baf8dd00bf86eb4f4988eb567191e8081fc1f9add553f5b4a14ef4456e0e9c0d7a06cbbc1d2a5981baa3
+  data.tar.gz: d9a0d73a76400eff536c5b2bfc86fb1e2d2d447aa46238cf18b9874c11cb11c28a98ecd5a5dca7e1606cf9bcfa9df5d91b566521db16aed09485646872150524

data/lib/puppet_metadata/aio.rb

@@ -46,6 +46,7 @@ module PuppetMetadata
         '16.04' => 5..7,
         '18.04' => 5..7,
         '20.04' => 6..7,
+        '22.04' => [], # https://tickets.puppetlabs.com/browse/PA-4233
       },
     }.freeze
 

data/lib/puppet_metadata/beaker.rb

@@ -65,7 +65,7 @@ module PuppetMetadata
       # 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)
+        ['Archlinux', 'CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
       end
 
       private

data/lib/puppet_metadata/github_actions.rb

@@ -52,25 +52,42 @@ module PuppetMetadata
       end.compact
     end
 
-    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
+    def beaker_os_releases
+      majors = puppet_major_versions
 
-            matrix_include << {
-              setfile: {
-                name: setfile[1],
-                value: setfile[0],
-              },
-              puppet: puppet_version
-            }
+      metadata.operatingsystems.each do |os, releases|
+        case os
+        when 'Archlinux', 'Gentoo'
+          yield [os, 'rolling', majors.max_by { |v| v[:value] }]
+        else
+          releases&.each do |release|
+            majors.each do |puppet_version|
+              if AIO.has_aio_build?(os, release, puppet_version[:value])
+                yield [os, release, puppet_version]
+              end
+            end
           end
         end
       end
     end
+
+    def github_action_test_matrix(use_fqdn: false, pidfile_workaround: false)
+      matrix_include = []
+
+      beaker_os_releases do |os, release, puppet_version|
+        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
+
+      matrix_include
+    end
   end
 end

data/lib/puppet_metadata/operatingsystem.rb

@@ -71,6 +71,19 @@ module PuppetMetadata
         '2' => '2005-04-11',
         '1' => '2004-09-20',
       },
+      # https://endoflife.software/operating-systems/unix-like-bsd/freebsd
+      'FreeBSD' => {
+        '13' => nil,
+        '12' => nil,
+        '11' => '2021-09-30',
+        '10' => '2018-10-31',
+        '9' => '2016-12-31',
+        '8' => '2015-08-01',
+        '7' => '2013-02-28',
+        '6' => '2010-11-30',
+        '5' => '2008-05-31',
+        '4' => '2007-01-31',
+      },
       # https://endoflife.software/operating-systems/linux/red-hat-enterprise-linux-rhel
       'RedHat' => {
         # TODO: EOL is standard support, not the extended life cycle
@@ -83,6 +96,9 @@ module PuppetMetadata
       },
       # https://endoflife.software/operating-systems/linux/ubuntu
       'Ubuntu' => {
+        '22.04' => '2027-04-15',
+        '21.10' => '2022-07-15',
+        '20.10' => '2021-07-15',
         '20.04' => '2025-04-15',
         '19.10' => '2020-07-15',
         '19.04' => '2020-01-15',
@@ -158,6 +174,15 @@ module PuppetMetadata
         releases = EOL_DATES[operatingsystem]
         releases&.keys&.max_by { |release| Gem::Version.new(release) }
       end
+
+      # Return an array of all Operating System versions that aren't EoL
+      # @param String operatingsystem The operating system
+      # @return [Array] All Operating System versions that aren't EoL today
+      def supported_releases(operatingsystem)
+        releases = EOL_DATES[operatingsystem]
+        today = Date.today
+        releases.compact.select {|release, eol_date| Date.parse(eol_date) > today}.keys.sort
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Data structures for the Puppet Metadata