puppet_metadata 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac5190193748a7ec1f0d61f9c7ef2bac509bb78e1e854b373362e421cf4a656
-  data.tar.gz: dcafc939d26360e09cd7525b72ca2e4268802d2e4103d4c61b14570a4700a402
+  metadata.gz: 6214264b2f9a9a8848eb3a02fb25b376f597b7fe083b1a96b2cc2625cea88e16
+  data.tar.gz: 8475ef16fdeb252ac39f26135dcaba133ccfa85665cfaa326de1f00b542bf233
 SHA512:
-  metadata.gz: 7e18f077b5298afce2a703c1c1c66d941f447a72740dc29105b57d9cd1cb929ed4c4a537a021950ca4ed2c1cda06eaf40d3f1e8c927f7b05212b1f241e0db331
-  data.tar.gz: b16239f27e4a1c74174816fe1b59bd28f1503f4839fc52bfc952f3c6ce1fe3d70bdccacb138f136e1f75a1423ef1537d574c07b2625bc044a8a12094ade701a6
+  metadata.gz: 79311279ba3fb754c8c9bf2dd4435d90546ce73d3f3d4a051f8d3e931976f5558f0aae086aa580d756d8adc6338ac195e45b91abd781032aba049f1301e43b69
+  data.tar.gz: 9fb3ffeb08c835bcac25a891e7083fe2b4598011b3c8ac686ec52dd339eefc00a9cda9cc89848c7e9d51457069c9972859892db66984c8d44d155b980eb925b4

data/README.md

@@ -8,7 +8,8 @@
 [![RubyGem Downloads](https://img.shields.io/gem/dt/puppet_metadata.svg)](https://rubygems.org/gems/puppet_metadata)
 [![Donated by Ewoud Kohl van Wijngaarden](https://img.shields.io/badge/donated%20by-Ewoud%20Kohl%20van%20Wijngaarden-fb7047.svg)](#transfer-notice)
 
-The gem intends to provide an abstraction over Puppet's metadata.json file. Its API allow easy iteration over its illogical data structures.
+The gem intends to provide an abstraction over Puppet's metadata.json file.
+Its API allow easy iteration over its illogical data structures.
 
 - [puppet\_metadata](#puppet_metadata)
   - [New CLI interface in 6.0.0](#new-cli-interface-in-600)
@@ -126,7 +127,8 @@ Debian => 13
 
 ## Generating Github Actions outputs
 
-To get outputs [usable in Github Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions), there is the `metadata2gha` command available. This generates based on metadata.json, such as [Beaker](https://github.com/voxpupuli/beaker) setfiles, Puppet major versions and a Puppet unit test matrix.
+To get outputs [usable in Github Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions), there is the `metadata2gha` command available.
+This generates based on metadata.json, such as [Beaker](https://github.com/voxpupuli/beaker) setfiles, Puppet major versions and a Puppet unit test matrix.
 
 ```console
 $ metadata2gha
@@ -258,6 +260,75 @@ This results in the following JSON data
 ]
 ```
 
+We can also limit the matrix to a specific collection:
+
+```console
+$ metadata2gha --collection openvox8
+```
+
+```
+[
+  {
+    "name": "OpenVox 8 - AlmaLinux 8",
+    "env": {
+      "BEAKER_PUPPET_COLLECTION": "openvox8",
+      "BEAKER_SETFILE": "almalinux8-64{hostname=almalinux8-64-openvox8}"
+    }
+  },
+  {
+    "name": "OpenVox 8 - AlmaLinux 9",
+    "env": {
+      "BEAKER_PUPPET_COLLECTION": "openvox8",
+      "BEAKER_SETFILE": "almalinux9-64{hostname=almalinux9-64-openvox8}"
+    }
+  },
+  {
+    "name": "OpenVox 8 - CentOS 9",
+    "env": {
+      "BEAKER_PUPPET_COLLECTION": "openvox8",
+      "BEAKER_SETFILE": "centos9-64{hostname=centos9-64-openvox8}"
+    }
+  },
+  {
+    "name": "OpenVox 8 - Debian 11",
+    "env": {
+      "BEAKER_PUPPET_COLLECTION": "openvox8",
+      "BEAKER_SETFILE": "debian11-64{hostname=debian11-64-openvox8}"
+    }
+  }
+]
+```
+
+There is also the special collection `staging`.
+This will generate a matrix for all OS releases with AIO packages.
+The idea is to test unreleased packages.
+
+```
+[
+  {
+    "name": "OpenVox 8 - AlmaLinux 8",
+    "env": {
+      "BEAKER_PUPPET_COLLECTION": "staging",
+      "BEAKER_SETFILE": "almalinux8-64{hostname=almalinux8-64-staging}"
+    }
+  },
+  {
+    "name": "OpenVox 8 - AlmaLinux 9",
+    "env": {
+      "BEAKER_PUPPET_COLLECTION": "staging",
+      "BEAKER_SETFILE": "almalinux9-64{hostname=almalinux9-64-staging}"
+    }
+  },
+  {
+    "name": "OpenVox 8 - CentOS 9",
+    "env": {
+      "BEAKER_PUPPET_COLLECTION": "staging",
+      "BEAKER_SETFILE": "centos9-64{hostname=centos9-64-staging}"
+    }
+  }
+]
+```
+
 ## Work with the API
 
 The API can be initialised like this:

data/bin/metadata2gha

@@ -13,6 +13,7 @@ options = {
 OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options] metadata"
 
+  opts.on('-c', '--collection VALUE', 'Limit GitHub jobs to only test this specific collection') { |opt| options[:collection] = 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|

data/bin/update_eol_dates

@@ -206,6 +206,26 @@ def handle_ubuntu(current_data)
   updated_data
 end
 
+def sort_versions(versions)
+  versions.sort do |a, b|
+    version_a, eol_a = a
+    version_b, eol_b = b
+
+    # Handle nil values (not yet EOL) - they go first
+    if eol_a.nil? && !eol_b.nil?
+      -1
+    elsif !eol_a.nil? && eol_b.nil?
+      1
+    elsif eol_a == eol_b
+      # Same EOL date (or both nil) - sort by version number descending
+      Gem::Version.new(version_b) <=> Gem::Version.new(version_a)
+    else
+      # Different EOL dates - sort by date descending (later date first)
+      eol_b <=> eol_a
+    end
+  end.to_h
+end
+
 def main
   data_file = File.expand_path('../data/eol_dates.json', __dir__)
 
@@ -231,26 +251,7 @@ def main
   end
 
   # Sort each OS's versions by EOL date (latest EOL first, then nulls)
-  sorted_data = {}
-  updated_data.each do |os_name, versions|
-    sorted_versions = versions.sort do |a, b|
-      version_a, eol_a = a
-      version_b, eol_b = b
-
-      # Handle nil values (not yet EOL) - they go first
-      return -1 if eol_a.nil? && !eol_b.nil?
-      return 1 if !eol_a.nil? && eol_b.nil?
-
-      if eol_a == eol_b
-        # Same EOL date (or both nil) - sort by version number descending
-        Gem::Version.new(version_b) <=> Gem::Version.new(version_a)
-      else
-        # Different EOL dates - sort by date descending (later date first)
-        (eol_b || '0000-00-00') <=> (eol_a || '0000-00-00')
-      end
-    end.to_h
-    sorted_data[os_name] = sorted_versions
-  end
+  sorted_data = updated_data.transform_values { |versions| sort_versions(versions) }
 
   File.write(data_file, "#{JSON.pretty_generate(sorted_data)}\n")
   puts "\nUpdated #{data_file}"

data/data/eol_dates.json

@@ -7,27 +7,27 @@
   "Amazon": {
     "2023": "2029-06-30",
     "2.0": "2026-06-30",
-    "2010.11": "2023-12-31",
-    "2011.09": "2023-12-31",
-    "2012.03": "2023-12-31",
-    "2012.09": "2023-12-31",
-    "2013.03": "2023-12-31",
-    "2013.09": "2023-12-31",
-    "2014.03": "2023-12-31",
-    "2014.09": "2023-12-31",
-    "2015.03": "2023-12-31",
-    "2015.09": "2023-12-31",
-    "2016.03": "2023-12-31",
-    "2016.09": "2023-12-31",
-    "2017.03": "2023-12-31",
+    "2018.03": "2023-12-31",
     "2017.09": "2023-12-31",
-    "2018.03": "2023-12-31"
+    "2017.03": "2023-12-31",
+    "2016.09": "2023-12-31",
+    "2016.03": "2023-12-31",
+    "2015.09": "2023-12-31",
+    "2015.03": "2023-12-31",
+    "2014.09": "2023-12-31",
+    "2014.03": "2023-12-31",
+    "2013.09": "2023-12-31",
+    "2013.03": "2023-12-31",
+    "2012.09": "2023-12-31",
+    "2012.03": "2023-12-31",
+    "2011.09": "2023-12-31",
+    "2010.11": "2023-12-31"
   },
   "CentOS": {
     "10": "2030-01-01",
     "9": "2027-05-31",
     "7": "2024-06-30",
-    "8": "2021-12-31",
+    "8": "2024-05-31",
     "6": "2020-11-30",
     "5": "2017-03-31",
     "4": "2012-02-29",
@@ -47,7 +47,7 @@
     "3.1": "2008-03-31",
     "3.0": "2006-06-30",
     "2.2": "2003-06-30",
-    "2.1": "2000-09-30",
+    "2.1": "2000-10-30",
     "2.0": "1999-02-15",
     "1.3": "1998-12-08",
     "1.2": "1997-10-23",
@@ -63,7 +63,7 @@
   "Fedora": {
     "43": "2026-12-09",
     "42": "2026-05-13",
-    "41": "2025-11-26",
+    "41": "2025-12-15",
     "40": "2025-05-13",
     "39": "2024-11-26",
     "38": "2024-05-21",
@@ -106,66 +106,69 @@
     "1": "2004-09-20"
   },
   "FreeBSD": {
+    "15": "2029-12-31",
     "14": "2028-11-30",
+    "14.4": "2026-12-31",
+    "15.0": "2026-09-30",
     "14.3": "2026-06-30",
-    "13": "2026-04-30",
     "13.5": "2026-04-30",
+    "13": "2026-04-30",
     "14.2": "2025-09-30",
     "13.4": "2025-06-30",
     "14.1": "2025-03-31",
     "13.3": "2024-12-31",
     "14.0": "2024-09-30",
     "13.2": "2024-06-30",
-    "12": "2023-12-31",
     "12.4": "2023-12-31",
+    "12": "2023-12-31",
     "13.1": "2023-07-31",
     "12.3": "2023-03-31",
     "13.0": "2022-08-31",
     "12.2": "2022-03-31",
-    "11": "2021-09-30",
     "11.4": "2021-09-30",
+    "11": "2021-09-30",
     "12.1": "2021-01-31",
     "11.3": "2020-09-30",
     "12.0": "2020-02-29",
     "11.2": "2019-10-31",
-    "10": "2018-10-31",
     "10.4": "2018-10-31",
+    "10": "2018-10-31",
     "11.1": "2018-09-30",
     "10.3": "2018-04-30",
     "11.0": "2017-11-30",
-    "9": "2016-12-31",
-    "9.3": "2016-12-31",
-    "10.1": "2016-12-31",
     "10.2": "2016-12-31",
-    "8": "2015-08-01",
+    "10.1": "2016-12-31",
+    "9.3": "2016-12-31",
+    "9": "2016-12-31",
     "8.4": "2015-08-01",
+    "8": "2015-08-01",
     "10.0": "2015-02-28",
-    "9.1": "2014-12-31",
     "9.2": "2014-12-31",
+    "9.1": "2014-12-31",
     "8.3": "2014-04-30",
     "9.0": "2013-03-31",
-    "7": "2013-02-28",
     "7.4": "2013-02-28",
-    "8.1": "2012-07-31",
+    "7": "2013-02-28",
     "8.2": "2012-07-31",
+    "8.1": "2012-07-31",
     "7.3": "2012-03-31",
     "7.1": "2011-02-28",
-    "6": "2010-11-30",
-    "6.4": "2010-11-30",
     "8.0": "2010-11-30",
+    "6.4": "2010-11-30",
+    "6": "2010-11-30",
     "7.2": "2010-06-30",
     "6.3": "2010-01-31",
     "7.0": "2009-04-30",
-    "5": "2008-05-31",
+    "6.2": "2008-05-31",
     "6.1": "2008-05-31",
     "5.5": "2008-05-31",
-    "6.2": "2008-05-31",
-    "4": "2007-01-31",
-    "4.10": "2007-01-31",
-    "4.11": "2007-01-31",
+    "5": "2008-05-31",
     "6.0": "2007-01-31",
-    "5.3": "2006-10-31",
+    "4.11": "2007-01-31",
+    "4.10": "2007-01-31",
+    "4": "2007-01-31",
     "5.4": "2006-10-31",
+    "5.3": "2006-10-31",
     "5.2": "2005-02-28",
     "4.9": "2004-08-31",
     "5.1": "2004-04-30",
@@ -207,20 +210,21 @@
     "8": "2029-05-31"
   },
   "Scientific": {
-    "7": "2024-06-30",
     "8": "2024-06-30",
+    "7": "2024-06-30",
     "6": "2020-11-30",
     "5": "2017-03-31",
     "4": "2012-02-29",
     "3": "2010-10-30"
   },
   "SLES": {
-    "15": "2031-07-31",
     "15.7": "2031-07-31",
+    "15": "2031-07-31",
+    "16.0": "2027-11-30",
     "15.6": "2025-12-31",
     "15.5": "2024-12-31",
-    "12": "2024-10-31",
     "12.5": "2024-10-31",
+    "12": "2024-10-31",
     "15.4": "2023-12-31",
     "15.3": "2022-12-31",
     "15.2": "2021-12-31",
@@ -228,15 +232,15 @@
     "12.4": "2020-06-30",
     "15.0": "2019-12-31",
     "12.3": "2019-06-30",
-    "11": "2019-03-31",
     "11.4": "2019-03-31",
+    "11": "2019-03-31",
     "12.2": "2018-03-31",
     "12.1": "2017-05-31",
     "12.0": "2016-06-30",
     "11.3": "2016-01-31",
     "11.2": "2014-01-31",
-    "10": "2013-07-31",
     "10.4": "2013-07-31",
+    "10": "2013-07-31",
     "11.1": "2012-08-31",
     "10.3": "2011-10-11",
     "11.0": "2010-12-31",
@@ -245,7 +249,8 @@
     "10.0": "2007-12-31"
   },
   "Ubuntu": {
-    "24.04": "2029-04-25",
+    "26.04": "2031-05-31",
+    "24.04": "2029-05-31",
     "22.04": "2027-04-01",
     "25.10": "2026-07-01",
     "25.04": "2026-01-17",
@@ -273,9 +278,9 @@
     "13.10": "2014-07-17",
     "12.10": "2014-05-16",
     "13.04": "2014-01-27",
-    "8.04": "2013-05-09",
-    "10.04": "2013-05-09",
     "11.10": "2013-05-09",
+    "10.04": "2013-05-09",
+    "8.04": "2013-05-09",
     "11.04": "2012-10-28",
     "10.10": "2012-04-10",
     "6.06": "2011-06-01",

data/lib/puppet_metadata/aio.rb

@@ -52,6 +52,12 @@ module PuppetMetadata
                                              '12' => 7..8,
                                              '13' => [8],
                                            },
+                                           'Ubuntu' => {
+                                             '20.04' => 7..8,
+                                             '22.04' => 7..8,
+                                             '24.04' => 7..8,
+                                             '26.04' => [8],
+                                           },
                                          }).freeze
 
     PUPPET_RUBY_VERSIONS = {

data/lib/puppet_metadata/github_actions.rb

@@ -56,37 +56,63 @@ module PuppetMetadata
 
     def beaker_os_releases(at = nil)
       majors = beaker_major_versions
-      distro_puppet_version = {
-        name: 'Distro Puppet',
-        value: nil, # We don't know the version and since it's rolling, it can be anything
-        collection: 'none',
-        requirement: 'puppet',
-      }
-      metadata.operatingsystems.each do |os, releases|
-        case os
-        when 'Archlinux', 'Gentoo'
-          # both currently only ship puppet, not openvox yet
-          yield [os, 'rolling', distro_puppet_version]
-        else
+      # for staging, we don't want to have one job per major openvox/puppet version
+      # we just want to pull a specific, unreleased, package from a webserver
+      # and we only do this for AIO builds, because we don't have other packages
+      collection = options[:collection]
+      collection = nil if collection&.empty?
+      if collection == 'staging'
+        latest = majors.first.dup
+        latest[:collection] = 'staging'
+        metadata.operatingsystems.each do |os, releases|
+          # iterates on all releases for one OS
+          # `&` in case the OS has no releases in metadata.json
           releases&.each do |release|
-            if PuppetMetadata::OperatingSystem.eol?(os, release, at)
-              message = "Skipping EOL operating system #{os} #{release}"
-
-              if ENV.key?('GITHUB_ACTIONS')
-                # TODO: determine file and position within the file
-                puts "::warning file=metadata.json::#{message}"
-              else
-                warn message
+            next if PuppetMetadata::OperatingSystem.eol?(os, release, at)
+
+            yield [os, release, latest] if AIO.has_aio_build?(os, release, latest[:value], latest[:requirement])
+          end
+        end
+      else
+        distro_puppet_version = {
+          name: 'Distro Puppet',
+          value: nil, # We don't know the version and since it's rolling, it can be anything
+          collection: 'none',
+          requirement: 'puppet',
+        }
+        metadata.operatingsystems.each do |os, releases|
+          case os
+          when 'Archlinux', 'Gentoo'
+            # we filter out the rolling distributions because we don't know which openvox/puppet version we get and we want a specific collection
+            next if collection
+
+            # both currently only ship puppet, not openvox yet
+            yield [os, 'rolling', distro_puppet_version]
+          else
+            releases&.each do |release|
+              if PuppetMetadata::OperatingSystem.eol?(os, release, at)
+                message = "Skipping EOL operating system #{os} #{release}"
+
+                if ENV.key?('GITHUB_ACTIONS')
+                  # TODO: determine file and position within the file
+                  puts "::warning file=metadata.json::#{message}"
+                else
+                  warn message
+                end
+
+                next
               end
 
-              next
-            end
+              majors.each do |puppet_version|
+                # if a collection is set, it's not 'staging'
+                # we then want to filter out all results that don't match our provided collection
+                next if collection && puppet_version[:collection] != collection
 
-            majors.each do |puppet_version|
-              if AIO.has_aio_build?(os, release, puppet_version[:value], puppet_version[:requirement])
-                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])]
+                if AIO.has_aio_build?(os, release, puppet_version[:value], puppet_version[:requirement])
+                  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
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -118,14 +118,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Data structures for the Puppet Metadata
 test_files: []