puppet_litmus 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90707a24847ee4fe4f60fcaaaab2fa842a74e0427ff1a07ca04175ba43e3062
-  data.tar.gz: 3e795719a624a4fab0471ba2c6cf4ddf57b660e36cade3b85552d6e36f0f0ee1
+  metadata.gz: 0e2ad6ea0b4f8ee3598ab6ede1cd5a7ae69182c6e7f63f8c3ea8ee96efa4bef7
+  data.tar.gz: 18ff23ee19ef67c034985342ae4de1d2e8b3263312caad20773cdfed5794663f
 SHA512:
-  metadata.gz: ef6091982bf5b706ac9ed64cd17c09c2e89840a8d84a6ed7f236c291975056bd09c17e8d8377c228bdc4a03f65ef566fe35a99d2f78f26dbc2bebd7cbc1bf070
-  data.tar.gz: 8623539b486ae72bb584da01831d2c02778f2fa92af7710bd1583dcc19622887b38b5177be56fb83422b7d4ea9b68ba7f58a8fa0270cfd0b891c1a8895d272ae
+  metadata.gz: 9da34a392feada10b9517a263bd1c42c81c59059750b91aad9821ae015a218a64f6de9257880d46669e84a5388a4052e859d0f42771c278ddf21f586120a891e
+  data.tar.gz: 16bf3d8cc98f8ec297d714c713bfef84d1b02c26d4d5ad0698866d2fd403e795d02aa63162e9ad11ddf7669e4f2291984a044d7aa613755f81fb785f6d446ce6

data/README.md

@@ -74,6 +74,7 @@ in the project module root directory run `bundle exec matrix_from_metadata_v3`
 | --provision-include | NAME  | all               | Select provisioner |
 | --provision-exclude | NAME  | provision_service | Filter provisioner |
 | --nightly           |       |                   | Install from the nightly puppetcore images |
+| --latest-agent      |       |                   | Return the latest agent version as part of the matrix. Note: This changes how the collection is returned |
 
 > Refer to the [built-in matrix.json](https://github.com/puppetlabs/puppet_litmus/blob/main/exe/matrix.json) for a list of supported collection, provisioners, and platforms.
 

data/exe/matrix.json

@@ -86,7 +86,7 @@
     },
     "github_runner": {
         "docker": {
-            "^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|Ubuntu-18|Debian-10)": "ubuntu-22.04"
+            "^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|AlmaLinux-8|Ubuntu-18|Debian-10)": "ubuntu-22.04"
         }
     }
 }

data/exe/matrix_from_metadata_v3

@@ -163,11 +163,14 @@ begin
     opt.on('--provision-exclude NAME', String, "Filter provisioner (default: #{default_options[:'provision-exclude'] || 'none'})") { |o| options.provision_exclude.push(*o.split(',')) }
 
     opt.on('--nightly', TrueClass, 'Enable nightly builds') { |o| options.nightly = o }
+    opt.on('--latest-agent', TrueClass, 'Return the latest agent build as part of the matrix') { |o| options.latest_agent = o }
   end.parse!
 
   Action.config(debug: true) if options[:debug]
   Action.config(notice: false) if options[:quiet] && !options[:debug]
 
+  raise OptionParser::InvalidArgument, 'latest-agent and pe-include are mutually exclusive options' if options[:latest_agent] && options[:pe_include]
+
   # validate provisioners
   options[:provision_include].select! do |p|
     options[:matrix]['provisioners'].key?(p) or raise OptionParser::InvalidArgument, "--provision-include '#{p}' not found in provisioners"
@@ -262,12 +265,42 @@ options[:metadata]['requirements']&.each do |req|
     # This assumes that such a boundary will always allow the latest actually existing puppet version of a release stream, trading off simplicity vs accuracy here.
     next unless gem_req.satisfied_by?(Gem::Version.new("#{collection['puppet'].to_i}.9999"))
 
+    # # If requested, return the latest agent version for the collection's puppet version
+    # # If not requested, return the value latest
+    agent_version = if options[:latest_agent] && collection['puppet'] != 'nightly'
+                      require 'net/http'
+                      require 'json'
+                      require 'uri'
+
+                      uri = URI('https://forgeapi.puppet.com/private/versions/puppet-agent')
+                      response = Net::HTTP.get_response(uri)
+                      json_data = JSON.parse(response.body)
+                      all_versions = json_data.keys
+                      versionx = all_versions.select { |v| v.start_with?("#{collection['puppet'].to_i}.") }
+                      versionx.sort_by { |v| Gem::Version.new(v) }.last # rubocop:disable Style/RedundantSort
+                    end
+
     version = collection['puppet'].to_i
     prefix = 'puppetcore'
-    matrix[:collection] << if options[:nightly]
-                             "#{prefix}#{version}-nightly"
+    group = if options[:nightly]
+              "#{prefix}#{version}-nightly"
+            else
+              "#{prefix}#{version}"
+            end
+    matrix[:collection] << if options[:latest_agent] && collection['puppet'] != 'nightly'
+                             require 'net/http'
+                             require 'json'
+                             require 'uri'
+
+                             uri = URI('https://forgeapi.puppet.com/private/versions/puppet-agent')
+                             response = Net::HTTP.get_response(uri)
+                             json_data = JSON.parse(response.body)
+                             all_versions = json_data.keys
+                             versionx = all_versions.select { |v| v.start_with?("#{collection['puppet'].to_i}.") }
+                             versionx.sort_by { |v| Gem::Version.new(v) }.last # rubocop:disable Style/RedundantSort
+                             { collection: group, version: agent_version }
                            else
-                             "#{prefix}#{version}"
+                             group
                            end
 
     spec_matrix[:include] << {

data/lib/puppet_litmus/version.rb

@@ -2,5 +2,5 @@
 
 # version of this gem
 module PuppetLitmus
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/spec/exe/matrix_from_metadata_v3_spec.rb

@@ -280,4 +280,25 @@ RSpec.describe 'matrix_from_metadata_v3' do
       )
     end
   end
+
+  context 'with argument --latest-agent' do
+    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--latest-agent']) }
+
+    it 'run successfully' do
+      expect(result.status_code).to eq 0
+    end
+
+    it 'generates the matrix' do
+      expect(result.stdout).to include(
+        '::warning::CentOS-6 no provisioner found',
+        '::warning::Ubuntu-14.04 no provisioner found',
+        '::group::matrix',
+        '::group::spec_matrix'
+      )
+      expect(github_output_content).to match(/{"collection":"puppetcore8","version":"\d+\.\d+\.\d+"}/)
+      expect(github_output_content).to include(
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+      )
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-30 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt