puppet_litmus 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9351e4016b6c6d4f394ac28c0f97e0b6c815963f8e387beb9d56c9358bd2f797
-  data.tar.gz: ca62cf15ef208854e897e6109c65c09a4d9a1913290c15f2a2340e9b6ec073ab
+  metadata.gz: a90707a24847ee4fe4f60fcaaaab2fa842a74e0427ff1a07ca04175ba43e3062
+  data.tar.gz: 3e795719a624a4fab0471ba2c6cf4ddf57b660e36cade3b85552d6e36f0f0ee1
 SHA512:
-  metadata.gz: a817ad015da1eda9b9abb01b43d882653895d4f6b992e705eddf36dbd43d27b13305cc5c37a7f104b7458b59248add0f0d2e3f0b7a5b42d3c097e370b107d3ec
-  data.tar.gz: d1ed5ca355583f9ea58e78c88f21bf32de414ffe2732cd81002bc7fce8099920d37a2690a026f87e469fa048f30140f58caa8a3e2264a63a534094d127d19528
+  metadata.gz: ef6091982bf5b706ac9ed64cd17c09c2e89840a8d84a6ed7f236c291975056bd09c17e8d8377c228bdc4a03f65ef566fe35a99d2f78f26dbc2bebd7cbc1bf070
+  data.tar.gz: 8623539b486ae72bb584da01831d2c02778f2fa92af7710bd1583dcc19622887b38b5177be56fb83422b7d4ea9b68ba7f58a8fa0270cfd0b891c1a8895d272ae

data/README.md

@@ -73,6 +73,7 @@ in the project module root directory run `bundle exec matrix_from_metadata_v3`
 | --provision-prefer  | NAME  | docker            | Prefer provisioner |
 | --provision-include | NAME  | all               | Select provisioner |
 | --provision-exclude | NAME  | provision_service | Filter provisioner |
+| --nightly           |       |                   | Install from the nightly puppetcore images |
 
 > 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.
 
@@ -90,6 +91,10 @@ in the project module root directory run `bundle exec matrix_from_metadata_v3`
   ```sh
   matrix_from_metadata_v3 --arch-exclude x86_64
   ```
+* Run against the nightly puppetcore images
+  ```sh
+  matrix_from_metadata_v3 --nightly
+  ```
 
 ## Documentation
 

data/exe/matrix_from_metadata_v2

@@ -231,7 +231,14 @@ end
 
 puts '::warning::matrix_from_metadata_v2 is now deprecated and will be removed in puppet_litmus v3, please migrate to matrix_from_metadata_v3.'
 # Set to defaults (all collections) if no matches are found
-matrix[:collection] = COLLECTION_TABLE.map { |collection| "puppet#{collection[:puppet_maj_version]}-nightly" } if matrix[:collection].empty?
+if matrix[:collection].empty?
+  COLLECTION_TABLE.map do |collection|
+    version = collection[:puppet_maj_version]
+    prefix = version == 7 ? 'puppet' : 'puppetcore'
+    "#{prefix}#{version}-nightly"
+  end
+end
+
 # Just to make sure there aren't any duplicates
 matrix[:platforms] = matrix[:platforms].uniq.sort_by { |a| a[:label] } unless ARGV.include?('--custom-matrix')
 matrix[:collection] = matrix[:collection].uniq.sort

data/exe/matrix_from_metadata_v3

@@ -161,6 +161,8 @@ begin
     opt.on('--provision-prefer NAME', String, "Prefer provisioner (default: #{default_options[:'provision-prefer']})") { |o| options.provision_prefer.push(*o.split(',')) }
     opt.on('--provision-include NAME', String, 'Select provisioner (default: all)') { |o| options.provision_include.push(*o.split(',')) }
     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 }
   end.parse!
 
   Action.config(debug: true) if options[:debug]
@@ -260,7 +262,13 @@ 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"))
 
-    matrix[:collection] << "puppetcore#{collection['puppet'].to_i}"
+    version = collection['puppet'].to_i
+    prefix = 'puppetcore'
+    matrix[:collection] << if options[:nightly]
+                             "#{prefix}#{version}-nightly"
+                           else
+                             "#{prefix}#{version}"
+                           end
 
     spec_matrix[:include] << {
       puppet_version: "~> #{collection['puppet']}",

data/lib/puppet_litmus/version.rb

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

data/spec/exe/matrix_from_metadata_v3_spec.rb

@@ -233,11 +233,51 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '::group::spec_matrix'
       )
       expect(github_output_content).to include(
-        '"collection":["2023.8.0-puppet_enterprise","2021.7.9-puppet_enterprise","puppetcore8"'
+        '"collection":["2023.8.4-puppet_enterprise","2021.7.9-puppet_enterprise","puppetcore8"'
       )
       expect(github_output_content).to include(
         'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
     end
   end
+
+  context 'with argument --nightly' do
+    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--nightly']) }
+    let(:matrix) do
+      [
+        'matrix={',
+        '"platforms":[',
+        '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-22.04"},',
+        '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-22.04"},',
+        '{"label":"RedHat-8","provider":"provision_service","arch":"x86_64","image":"rhel-8","runner":"ubuntu-latest"},',
+        '{"label":"RedHat-9","provider":"provision_service","arch":"x86_64","image":"rhel-9","runner":"ubuntu-latest"},',
+        '{"label":"RedHat-9-arm","provider":"provision_service","arch":"arm","image":"rhel-9-arm64","runner":"ubuntu-latest"},',
+        '{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-22.04"},',
+        '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"},',
+        '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
+        '],',
+        '"collection":[',
+        '"puppetcore8-nightly"',
+        ']',
+        '}'
+      ].join
+    end
+
+    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 include(matrix)
+      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.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt