puppet_litmus 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e97ff4ce76e4656aec5eb55859964253b95e3dd07f46427bd96a3119d959b78b
-  data.tar.gz: 8101b71b60904bb20870bc6504296dd86b12e30dd2080f5a45a56bc0a7f232d9
+  metadata.gz: ae343528c6aa1a501ab3a74a35413af6fa597549117eabeb8187c34620ace77b
+  data.tar.gz: '084246ae80f218ff9fee07e7dc207ffafca0d1c88e4d7bf43f4698857465098c'
 SHA512:
-  metadata.gz: 1ae92889a2b3c5a46831817810059137e2d069c841a7ae156fcc90ebd112990f6023c33deaab5864dfdca32a64eb34aa83886f6a7cc394a58e20a8c3fb0798e1
-  data.tar.gz: b4295446eff91e4fe63256e0a01e093c8c89b80bc38f2a3f507dd3e41aef4ef6404754947428021b4452acd84890099d97a50307ab94a4ffc39dde4f4974f36a
+  metadata.gz: b04fdf66b039df83064c3a2e658990269994a4916cba170b06b47bcf94c0ec45cc536fdc627aa7ca51b49ce6a394baa13a4c42e3ef568ed6175f6f5dc1181abe
+  data.tar.gz: c130ece42862fbc1434971b153b8ff3e5e0a8a8a9c397dbe423ccf5b347c621c656d9c0e8544d704b95de4257ab0dc13db0fe5870da5e81b814a6f18ace93b5c

data/exe/matrix.json

@@ -3,6 +3,10 @@
         {
             "puppet": 8.0,
             "ruby": 3.2
+        },
+        {
+            "puppet": 9.0,
+            "ruby": 4.0
         }
     ],
     "provisioners": {
@@ -23,12 +27,14 @@
             "Debian": {
                 "10": { "x86_64": "debian-10" },
                 "11": { "x86_64": "debian-11" },
-                "12": { "x86_64": "debian-12", "arm": "debian-12-arm64" }
+                "12": { "x86_64": "debian-12", "arm": "debian-12-arm64" },
+                "13": { "x86_64": "debian-13" }
             },
             "RedHat": {
                 "7": { "x86_64": "rhel-7" },
                 "8": { "x86_64": "rhel-8" },
-                "9": { "x86_64": "rhel-9", "arm": "rhel-9-arm64" }
+                "9": { "x86_64": "rhel-9", "arm": "rhel-9-arm64" },
+                "10": { "x86_64": "rhel-10", "arm": "rhel-10-arm64" }
             },
             "SLES" : {
                 "12":  { "x86_64": "sles-12" },
@@ -42,7 +48,8 @@
             "Windows": {
                 "2016": { "x86_64": "windows-2016" },
                 "2019": { "x86_64": "windows-2019" },
-                "2022": { "x86_64": "windows-2022" }
+                "2022": { "x86_64": "windows-2022" },
+                "2025": { "x86_64": "windows-2025" }
             }
         },
         "docker": {
@@ -66,7 +73,8 @@
             "Debian": {
                 "10": { "x86_64": "litmusimage/debian:10" },
                 "11": { "x86_64": "litmusimage/debian:11" },
-                "12": { "x86_64": "litmusimage/debian:12" }
+                "12": { "x86_64": "litmusimage/debian:12" },
+                "13": { "x86_64": "litmusimage/debian:13" }
             },
             "OracleLinux": {
                 "7": { "x86_64": "litmusimage/oraclelinux:7" },

data/exe/matrix_from_metadata_v2

@@ -28,16 +28,19 @@ IMAGE_TABLE = {
   'RedHat-7' => 'rhel-7',
   'RedHat-8' => 'rhel-8',
   'RedHat-9' => 'rhel-9',
+  'RedHat-10' => 'rhel-10',
   'SLES-12' => 'sles-12',
   'SLES-15' => 'sles-15',
   'Windows-2016' => 'windows-2016',
   'Windows-2019' => 'windows-2019',
-  'Windows-2022' => 'windows-2022'
+  'Windows-2022' => 'windows-2022',
+  'Windows-2025' => 'windows-2025'
 }.freeze
 
 ARM_IMAGE_TABLE = {
   'Debian-12-arm' => 'debian-12-arm64',
   'RedHat-9-arm' => 'rhel-9-arm64',
+  'RedHat-10-arm' => 'rhel-10-arm64',
   'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64',
   'Ubuntu-24.04-arm' => 'ubuntu-2404-lts-arm64'
 }.freeze
@@ -55,6 +58,7 @@ DOCKER_PLATFORMS = {
   'Debian-10' => 'litmusimage/debian:10',
   'Debian-11' => 'litmusimage/debian:11',
   'Debian-12' => 'litmusimage/debian:12',
+  'Debian-13' => 'litmusimage/debian:13',
   'OracleLinux-7' => 'litmusimage/oraclelinux:7',
   'OracleLinux-8' => 'litmusimage/oraclelinux:8',
   'OracleLinux-9' => 'litmusimage/oraclelinux:9',
@@ -120,6 +124,7 @@ if ARGV.include?('--provision-service')
     'Debian-10' => 'debian-10',
     'Debian-11' => 'debian-11',
     'Debian-12' => 'debian-12',
+    'Debian-13' => 'debian-13',
     'Ubuntu-20.04' => 'ubuntu-2004-lts',
     'Ubuntu-22.04' => 'ubuntu-2204-lts',
     'Ubuntu-24.04' => 'ubuntu-2404-lts'

data/exe/matrix_from_metadata_v3

@@ -287,21 +287,25 @@ options[:metadata]['requirements']&.each do |req|
     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'
-                             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
-                             group
-                           end
+
+    # puppet 9+ is only published via puppetcore; skip it when falling back to the public collection
+    if forge_token || version < 9
+      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
+                               group
+                             end
+    end
 
     spec_matrix[:include] << {
       puppet_version: "~> #{collection['puppet']}",

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -42,11 +42,10 @@ module PuppetLitmus::InventoryManipulation
   # @param targets [Array]
   # @return [Array] array of targets.
   def find_targets(inventory_hash, targets)
-    if targets.nil?
-      inventory_hash.to_s.scan(/uri"=>"(\S*)"/).flatten
-    else
-      [targets]
-    end
+    return [targets] unless targets.nil?
+    return [] unless inventory_hash['groups']
+
+    targets_in_inventory(inventory_hash) { |target| target['uri'] }
   end
 
   # Recursively find and iterate over the groups in an inventory. If no block is passed

data/lib/puppet_litmus/rake_helper.rb

@@ -133,7 +133,7 @@ module PuppetLitmus::RakeHelper # rubocop:disable Metrics/ModuleLength
     # Skip forge token assignation when pointing to private collection endpoints as it is only accesible via VPN and it fails when credentials are passed.
     forge_token = ENV.fetch('PUPPET_FORGE_TOKEN', nil)
     params = {}
-    params['password'] = forge_token if forge_token && !collection.include?('puppetcore8-nightly')
+    params['password'] = forge_token unless !forge_token || (collection.start_with?('puppetcore') && collection.end_with?('-nightly'))
     params['collection'] = collection  if collection
     params['version'] = puppet_version if puppet_version
 

data/lib/puppet_litmus/version.rb

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

data/spec/exe/fake_metadata.json

@@ -31,7 +31,8 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
@@ -46,7 +47,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 9.0.0"
+      "version_requirement": ">= 8.0.0 < 10.0.0"
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",

data/spec/exe/matrix_from_metadata_v2_spec.rb

@@ -25,6 +25,8 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '"platforms":[',
           '{"label":"AmazonLinux-2","provider":"docker","image":"litmusimage/amazonlinux:2"},',
           '{"label":"AmazonLinux-2023","provider":"docker","image":"litmusimage/amazonlinux:2023"},',
+          '{"label":"RedHat-10","provider":"provision_service","image":"rhel-10"},',
+          '{"label":"RedHat-10-arm","provider":"provision_service","image":"rhel-10-arm64"},',
           '{"label":"RedHat-8","provider":"provision_service","image":"rhel-8"},',
           '{"label":"RedHat-9","provider":"provision_service","image":"rhel-9"},',
           '{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
@@ -33,15 +35,15 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
           '],',
           '"collection":[',
-          '"puppetcore7","puppetcore8"',
+          '"puppetcore8"',
           ']',
           '}'
         ].join
       )
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
-      expect(result.stdout).to include("Created matrix with 18 cells:\n  - Acceptance Test Cells: 16\n  - Spec Test Cells: 2")
+      expect(result.stdout).to include("Created matrix with 11 cells:\n  - Acceptance Test Cells: 10\n  - Spec Test Cells: 1")
     end
   end
 
@@ -68,6 +70,8 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '"platforms":[',
           '{"label":"AmazonLinux-2","provider":"docker","image":"litmusimage/amazonlinux:2"},',
           '{"label":"AmazonLinux-2023","provider":"docker","image":"litmusimage/amazonlinux:2023"},',
+          '{"label":"RedHat-10","provider":"provision_service","image":"rhel-10"},',
+          '{"label":"RedHat-10-arm","provider":"provision_service","image":"rhel-10-arm64"},',
           '{"label":"RedHat-8","provider":"provision_service","image":"rhel-8"},',
           '{"label":"RedHat-9","provider":"provision_service","image":"rhel-9"},',
           '{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
@@ -75,15 +79,15 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
           '],',
           '"collection":[',
-          '"puppetcore7","puppetcore8"',
+          '"puppetcore8"',
           ']',
           '}'
         ].join
       )
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
-      expect(result.stdout).to include("Created matrix with 16 cells:\n  - Acceptance Test Cells: 14\n  - Spec Test Cells: 2")
+      expect(result.stdout).to include("Created matrix with 10 cells:\n  - Acceptance Test Cells: 9\n  - Spec Test Cells: 1")
     end
   end
 
@@ -100,7 +104,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
       expect(result.status_code).to eq 0
     end
 
-    it 'generates the matrix without excluded platforms' do
+    it 'generates the matrix without excluded platforms' do # rubocop:disable RSpec/ExampleLength
       expect(result.stdout).to include('::warning::Cannot find image for Ubuntu-14.04')
       expect(result.stdout).to include('::warning::Cannot find image for CentOS-6')
       expect(result.stdout).to include('::warning::Ubuntu-18.04 was excluded from testing')
@@ -110,19 +114,21 @@ RSpec.describe 'matrix_from_metadata_v2' do
         [
           'matrix={',
           '"platforms":[',
+          '{"label":"RedHat-10","provider":"provision_service","image":"rhel-10"},',
+          '{"label":"RedHat-10-arm","provider":"provision_service","image":"rhel-10-arm64"},',
           '{"label":"RedHat-9-arm","provider":"provision_service","image":"rhel-9-arm64"},',
           '{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
           '],',
           '"collection":[',
-          '"puppetcore7","puppetcore8"',
+          '"puppetcore8"',
           ']',
           '}'
         ].join
       )
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
-      expect(result.stdout).to include("Created matrix with 6 cells:\n  - Acceptance Test Cells: 4\n  - Spec Test Cells: 2")
+      expect(result.stdout).to include("Created matrix with 5 cells:\n  - Acceptance Test Cells: 4\n  - Spec Test Cells: 1")
     end
   end
 
@@ -153,15 +159,15 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '{"label":"Ubuntu-22.04","provider":"docker","image":"litmusimage/ubuntu:22.04"}',
           '],',
           '"collection":[',
-          '"puppetcore7","puppetcore8"',
+          '"puppetcore8"',
           ']',
           '}'
         ].join
       )
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 7.24","ruby_version":2.7},{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
       )
-      expect(result.stdout).to include("Created matrix with 10 cells:\n  - Acceptance Test Cells: 8\n  - Spec Test Cells: 2")
+      expect(result.stdout).to include("Created matrix with 5 cells:\n  - Acceptance Test Cells: 4\n  - Spec Test Cells: 1")
     end
   end
 end

data/spec/exe/matrix_from_metadata_v3_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"}',
         '],',
         '"collection":[',
-        '"puppetcore8"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -41,7 +41,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '::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}]}')
+      expect(github_output_content).to include('spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}')
     end
   end
 
@@ -58,12 +58,14 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"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":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
+        '{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-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"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -82,7 +84,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
       )
       expect(github_output_content).to include(matrix)
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}'
       )
     end
   end
@@ -98,12 +100,14 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"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":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
+        '{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-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"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -122,7 +126,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
       )
       expect(github_output_content).to include(matrix)
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}'
       )
     end
   end
@@ -138,11 +142,13 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"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":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
+        '{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-arm64","runner":"ubuntu-latest"},',
         '{"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"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -162,20 +168,20 @@ RSpec.describe 'matrix_from_metadata_v3' do
       )
       expect(github_output_content).to include(matrix)
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}'
       )
     end
   end
 
-  context 'with --platform-exclude "ubuntu-(18.04|22.04)" --platform-exclude "redhat-[89]"' do
-    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--platform-exclude', '(amazonlinux|ubuntu)-(2|18.04|22.04|2023)', '--platform-exclude', 'redhat-[89]']) }
+  context 'with --platform-exclude "ubuntu-(18.04|22.04)" --platform-exclude "redhat-(8|9|10)"' do
+    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--platform-exclude', '(amazonlinux|ubuntu)-(2|18.04|22.04|2023)', '--platform-exclude', 'redhat-(8|9|10)']) }
     let(:matrix) do
       [
         'matrix={',
         '"platforms":[',
         '],',
         '"collection":[',
-        '"puppetcore8"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -191,6 +197,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '::warning::Ubuntu-14.04 no provisioner found',
         '::notice::platform-exclude filtered RedHat-8',
         '::notice::platform-exclude filtered RedHat-9',
+        '::notice::platform-exclude filtered RedHat-10',
         '::notice::platform-exclude filtered Ubuntu-18.04',
         '::notice::platform-exclude filtered Ubuntu-22.04',
         '::group::matrix',
@@ -198,7 +205,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
       )
       expect(github_output_content).to include(matrix)
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}'
       )
     end
   end
@@ -232,10 +239,9 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '::group::matrix',
         '::group::spec_matrix'
       )
-      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 match(/"collection":\[(?:"\d{4}\.\d\.\d-puppet_enterprise",)+"puppetcore8","puppetcore9"/)
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}'
       )
     end
   end
@@ -251,12 +257,14 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"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":"RedHat-10","provider":"provision_service","arch":"x86_64","image":"rhel-10","runner":"ubuntu-latest"},',
+        '{"label":"RedHat-10-arm","provider":"provision_service","arch":"arm","image":"rhel-10-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"',
+        '"puppetcore8-nightly","puppetcore9-nightly"',
         ']',
         '}'
       ].join
@@ -275,7 +283,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
       )
       expect(github_output_content).to include(matrix)
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}'
       )
     end
   end
@@ -321,9 +329,9 @@ 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 match(/{"collection":"puppetcore9","version":("\d+\.\d+\.\d+"|null)}/)
       expect(github_output_content).to include(
-        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2}]}'
+        'spec_matrix={"include":[{"puppet_version":"~> 8.0","ruby_version":3.2},{"puppet_version":"~> 9.0","ruby_version":4.0}]}'
       )
     end
   end

data/spec/lib/puppet_litmus/puppet_helpers_spec.rb

@@ -275,7 +275,7 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
         expect(self).to receive(:target_in_inventory?).and_return(true)
         expect(self).to receive(:run_task).with(task_name, 'some.host', params, config: config_data, inventory: inventory_hash).and_return(result_structured_task_success)
         method_result = run_bolt_task(task_name, params, opts: {})
-        expect(method_result.stdout).to eq('{"key1"=>"foo", "key2"=>"bar"}')
+        expect(method_result.stdout).to eq({ 'key1' => 'foo', 'key2' => 'bar' }.to_s)
         expect(method_result.result['key1']).to eq('foo')
         expect(method_result.result['key2']).to eq('bar')
       end

data/spec/lib/puppet_litmus/rake_helper_spec.rb

@@ -132,32 +132,32 @@ RSpec.describe PuppetLitmus::RakeHelper do
     end
     let(:targets) { ['some.host'] }
     let(:token) { 'some_token' }
-    let(:params) { { 'collection' => 'puppet6', 'password' => token } }
+    let(:params) { { 'collection' => 'puppet8', 'password' => token } }
 
     it 'calls function' do
       allow(ENV).to receive(:fetch).with('PUPPET_VERSION', nil).and_return(nil)
       allow(ENV).to receive(:fetch).with('PUPPET_FORGE_TOKEN', nil).and_return(token)
       allow(File).to receive(:directory?).with(File.join(described_class::DEFAULT_CONFIG_DATA['modulepath'], 'puppet_agent')).and_return(true)
       allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with('puppet_agent::install', targets, params, config: described_class::DEFAULT_CONFIG_DATA, inventory: inventory_hash).and_return([])
-      install_agent('puppet6', targets, inventory_hash)
+      install_agent('puppet8', targets, inventory_hash)
     end
 
     it 'adds puppet version' do
-      params = { 'collection' => 'puppet7', 'version' => '7.35.0' }
-      allow(ENV).to receive(:fetch).with('PUPPET_VERSION', nil).and_return('7.35.0')
+      params = { 'collection' => 'puppet8', 'version' => '8.0.0' }
+      allow(ENV).to receive(:fetch).with('PUPPET_VERSION', nil).and_return('8.0.0')
       allow(ENV).to receive(:fetch).with('PUPPET_FORGE_TOKEN', nil).and_return(nil)
       allow(File).to receive(:directory?).with(File.join(described_class::DEFAULT_CONFIG_DATA['modulepath'], 'puppet_agent')).and_return(true)
       allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with('puppet_agent::install', targets, params, config: described_class::DEFAULT_CONFIG_DATA, inventory: inventory_hash).and_return([])
-      install_agent('puppet7', targets, inventory_hash)
+      install_agent('puppet8', targets, inventory_hash)
     end
 
     it 'fails for puppetcore if no token supplied' do
-      params = { 'collection' => 'puppetcore7' }
+      params = { 'collection' => 'puppetcore8' }
       allow(ENV).to receive(:fetch).with('PUPPET_VERSION', nil).and_return(nil)
       allow(ENV).to receive(:fetch).with('PUPPET_FORGE_TOKEN', nil).and_return(nil)
       allow(File).to receive(:directory?).with(File.join(described_class::DEFAULT_CONFIG_DATA['modulepath'], 'puppet_agent')).and_return(true)
       allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with('puppet_agent::install', targets, params, config: described_class::DEFAULT_CONFIG_DATA, inventory: inventory_hash).and_return([])
-      expect { install_agent('puppetcore7', targets, inventory_hash) }.to raise_error(RuntimeError, /puppetcore agent installs require a valid PUPPET_FORGE_TOKEN set in the env\./)
+      expect { install_agent('puppetcore8', targets, inventory_hash) }.to raise_error(RuntimeError, /puppetcore agent installs require a valid PUPPET_FORGE_TOKEN set in the env\./)
     end
   end
 

data/spec/lib/puppet_litmus/rake_tasks_spec.rb

@@ -77,7 +77,7 @@ describe 'litmus rake tasks' do
   end
 
   context 'with litmus:install_modules_from_directory' do
-    let(:inventory_hash) { { 'groups' => [{ 'name' => 'ssh_nodes', 'nodes' => [{ 'uri' => 'some.host' }] }] } }
+    let(:inventory_hash) { { 'groups' => [{ 'name' => 'ssh_nodes', 'targets' => [{ 'uri' => 'some.host' }] }] } }
     let(:target_dir) { File.join(Dir.pwd, 'spec/fixtures/modules') }
     let(:dummy_tar) { 'spec/data/doot.tar.gz' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-30 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt