puppet_litmus 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c8a0cd69ad8f6cfb4eed234dfd6bc8debe88a1a7ef0b2945ff6d21c4addb90
-  data.tar.gz: c0fa10be3afdcbcca5309f40bcf785c1a3b1156261e329288c63c1aa8f2535f9
+  metadata.gz: e97ff4ce76e4656aec5eb55859964253b95e3dd07f46427bd96a3119d959b78b
+  data.tar.gz: 8101b71b60904bb20870bc6504296dd86b12e30dd2080f5a45a56bc0a7f232d9
 SHA512:
-  metadata.gz: 6bac57d756f85876882d6741cad40f56c386bd99b4d5ea34abd8137beaac21acb94cbc45ed26bba962d4fc7c115952d77f5076e4a8b4b2c233b55ed2cf0fbecb
-  data.tar.gz: 96dcb4de5adfd5ad7eab0ae916fdb9cc45c937a7758b2ee754d2936b7915bfbc35b2c5c6898e836f3027fa35d9799a77d818dab89cce90aa7da15bd55bbaa13d
+  metadata.gz: 1ae92889a2b3c5a46831817810059137e2d069c841a7ae156fcc90ebd112990f6023c33deaab5864dfdca32a64eb34aa83886f6a7cc394a58e20a8c3fb0798e1
+  data.tar.gz: b4295446eff91e4fe63256e0a01e093c8c89b80bc38f2a3f507dd3e41aef4ef6404754947428021b4452acd84890099d97a50307ab94a4ffc39dde4f4974f36a

data/exe/matrix.json

@@ -76,6 +76,9 @@
             "Scientific": {
                 "7": { "x86_64": "litmusimage/scientificlinux:7" }
             },
+            "SLES": {
+                "15": { "x86_64": "litmusimage/sles:15" }
+            },
             "Ubuntu": {
                 "18.04": { "x86_64": "litmusimage/ubuntu:18.04" },
                 "20.04": { "x86_64": "litmusimage/ubuntu:20.04" },
@@ -86,7 +89,7 @@
     },
     "github_runner": {
         "docker": {
-            "^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|(AlmaLinux|OracleLinux|Rocky|CentOS)-9|AlmaLinux-8|Fedora-36|Ubuntu-18|Debian-10)": "ubuntu-22.04"
+            "^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|(AlmaLinux|OracleLinux|Rocky|CentOS)-9|AlmaLinux-8|Fedora-36|SLES-15|Ubuntu-18|Debian-10)":  "ubuntu-22.04"
         }
     }
 }

data/exe/matrix_from_metadata_v3

@@ -281,12 +281,12 @@ options[:metadata]['requirements']&.each do |req|
                     end
 
     version = collection['puppet'].to_i
-    prefix = 'puppetcore'
-    group = if options[:nightly]
-              "#{prefix}#{version}-nightly"
-            else
-              "#{prefix}#{version}"
-            end
+    forge_token = ENV.fetch('PUPPET_FORGE_TOKEN', nil)
+    prefix = forge_token ? 'puppetcore' : 'puppet'
+    nightly = options[:nightly] && forge_token
+    Action.warning('--nightly ignored: PUPPET_FORGE_TOKEN is not set, falling back to public puppet collection') \
+      if options[:nightly] && !forge_token
+    group = nightly ? "#{prefix}#{version}-nightly" : "#{prefix}#{version}"
     matrix[:collection] << if options[:latest_agent] && collection['puppet'] != 'nightly'
                              require 'net/http'
                              require 'json'

data/lib/puppet_litmus/rake_helper.rb

@@ -143,8 +143,19 @@ module PuppetLitmus::RakeHelper # rubocop:disable Metrics/ModuleLength
     raise 'puppetcore agent installs require a valid PUPPET_FORGE_TOKEN set in the env.' \
         if collection =~ /\Apuppetcore.*/ && !forge_token
 
+    # Fix for SLES systems - ensure credentials file exists before agent installation
+    targets.each do |target|
+      node_facts = facts_from_node(inventory_hash, target)
+      next unless node_facts && node_facts['platform'] =~ /sles/i
+
+      result = run_command('touch /etc/zypp/credentials.d/PuppetcoreCreds',
+                           target, config: DEFAULT_CONFIG_DATA, inventory: inventory_hash.clone)
+      raise_bolt_errors(result, "Failed to create Puppet credentials file on SLES target #{target}.")
+    end
+
     # using boltspec, when the runner is called it changes the inventory_hash dropping the version field. The clone works around this
     bolt_result = run_task('puppet_agent::install', targets, params, config: DEFAULT_CONFIG_DATA, inventory: inventory_hash.clone)
+
     targets.each do |target|
       params = {
         'path' => '/opt/puppetlabs/bin'

data/lib/puppet_litmus/version.rb

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

data/spec/exe/matrix_from_metadata_v3_spec.rb

@@ -232,9 +232,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '::group::matrix',
         '::group::spec_matrix'
       )
-      expect(github_output_content).to include(
-        '"collection":["2023.8.6-puppet_enterprise","2021.7.9-puppet_enterprise","puppetcore8"'
-      )
+      expect(github_output_content).to match(/"collection":\["\d{4}\.\d\.\d-puppet_enterprise","\d{4}\.\d\.\d-puppet_enterprise","puppetcore8"/)
+
       expect(github_output_content).to include(
         'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
@@ -242,7 +241,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
   end
 
   context 'with argument --nightly' do
-    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--nightly']) }
+    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--nightly'], env: { 'PUPPET_FORGE_TOKEN' => 'fake_token' }) }
     let(:matrix) do
       [
         'matrix={',
@@ -281,6 +280,32 @@ RSpec.describe 'matrix_from_metadata_v3' do
     end
   end
 
+  context 'with --nightly and no PUPPET_FORGE_TOKEN' do
+    let(:result) { run_matrix_from_metadata_v3(['--nightly'], env: { 'PUPPET_FORGE_TOKEN' => nil }) }
+
+    it 'run successfully' do
+      expect(result.status_code).to eq 0
+    end
+
+    it 'falls back to public puppet collection with a warning' do
+      expect(result.stdout).to include('--nightly ignored: PUPPET_FORGE_TOKEN is not set, falling back to public puppet collection')
+      expect(github_output_content).to include('"collection":["puppet8"]')
+    end
+  end
+
+  context 'without PUPPET_FORGE_TOKEN' do
+    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs'], env: { 'PUPPET_FORGE_TOKEN' => nil }) }
+
+    it 'run successfully' do
+      expect(result.status_code).to eq 0
+    end
+
+    it 'falls back to public puppet collection' do
+      result
+      expect(github_output_content).to include('"collection":["puppet8"]')
+    end
+  end
+
   context 'with argument --latest-agent' do
     let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--latest-agent']) }
 
@@ -296,6 +321,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '::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}]}'
       )

data/spec/spec_helper.rb

@@ -38,14 +38,14 @@ def run_matrix_from_metadata_v2(options = {})
   )
 end
 
-def run_matrix_from_metadata_v3(options = [])
+def run_matrix_from_metadata_v3(options = [], env: {})
   command = %w[bundle exec ./exe/matrix_from_metadata_v3]
   unless options.include? '--metadata'
     options << '--metadata'
     options << File.join(File.dirname(__FILE__), 'exe', 'fake_metadata.json')
   end
   command += options
-  result = Open3.capture3(*command)
+  result = Open3.capture3(env, *command)
   OpenStruct.new(
     stdout: result[0],
     stderr: result[1],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-14 00:00:00.000000000 Z
+date: 2026-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Providing a simple command line tool for puppet content creators, to enable