puppet_litmus 2.6.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a5da663b866300b6b5a615485c799acf5e21734dcccc7218fa0eb90a5796aa
-  data.tar.gz: a6d3f206e3c5c5f7676d2bac31e39cb60171df89f43cafded174703d45f8e8e0
+  metadata.gz: ddb31ff29d7e1d38620998447c3b0374b5d83c000a728c82335b792d31713f69
+  data.tar.gz: 577f054f113f94e527749b187567b04f62335ce2eae6f4d36d299a554cacc6ca
 SHA512:
-  metadata.gz: f1c2dbfa634c423163cb8d2722d5fc172073d2c1daa2065d7acba8e95242e96ec22e63f53ded70180d1260c75df80ab7106e33bbb99dd42bf76ca15b02232323
-  data.tar.gz: 02cb42bb65966d51a94b57b87d590684a7b79101544bd30cafbfb3de85759e242ec0501759ecc432824bca55aaa3c5673bb1c9e63ebeef6845ad0dc77b4ddec0
+  metadata.gz: 500e38ceadb721af5cb4c45ae84d38edf417bd55411f67e5b910d9b74090739be94169d370cf7663a86f445c4853ca92fcf5e43170aaf5d01719cc4ba4a7c943
+  data.tar.gz: 38fd30196f4b5c6eb952bee7f230d5c14a76b9d75cc45eed4681abb72eec1e5075d61d5963a44bdc4a13be51d3dcb739e12ec14ae99877184efe8f11fedefbbe

data/README.md

@@ -68,6 +68,7 @@ in the project module root directory run `bundle exec matrix_from_metadata_v3`
 | --puppet-exclude    | MAJOR |                   | Filter puppet major version |
 | --platform-include  | REGEX |                   | Select platform |
 | --platform-exclude  | REGEX |                   | Filter platform |
+| --collection-platform-exclude | MAJOR:REGEX | | Filter a platform for one puppet major only, emitted as a GitHub Actions matrix exclude so the platform stays in other collections. Repeatable |
 | --arch-include      | REGEX |                   | Select architecture |
 | --arch-exclude      | REGEX |                   | Filter architecture |
 | --provision-prefer  | NAME  | docker            | Prefer provisioner |
@@ -88,6 +89,10 @@ in the project module root directory run `bundle exec matrix_from_metadata_v3`
   ```sh
   matrix_from_metadata_v3 --platform-exclude redhat-7 --platform-exclude ubuntu-18.04
   ```
+* Exclude a platform for one puppet major only (kept in other collections). E.g. ubuntu-20.04 has no Puppet 9 agent but is valid on Puppet 8:
+  ```sh
+  matrix_from_metadata_v3 --nightly --collection-platform-exclude 9:ubuntu-20.04
+  ```
 * Exclude architecture
   ```sh
   matrix_from_metadata_v3 --arch-exclude x86_64

data/exe/matrix.json

@@ -3,6 +3,10 @@
         {
             "puppet": 8.0,
             "ruby": 3.2
+        },
+        {
+            "puppet": 9.0,
+            "ruby": 4.0
         }
     ],
     "provisioners": {
@@ -44,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": {

data/exe/matrix_from_metadata_v2

@@ -33,7 +33,8 @@ IMAGE_TABLE = {
   '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 = {

data/exe/matrix_from_metadata_v3

@@ -86,6 +86,7 @@ options = OpenStruct.new(
   puppet_include: [],
   platform_exclude: [],
   platform_include: [],
+  collection_platform_exclude: [],
   arch_include: [],
   arch_exclude: [],
   provision_prefer: [],
@@ -155,6 +156,21 @@ begin
     opt.on('--platform-include REGEX', Regexp, 'Select platform') { |o| options.platform_include << o }
     opt.on('--platform-exclude REGEX', Regexp, 'Filter platform') { |o| options.platform_exclude << o }
 
+    opt.on('--collection-platform-exclude SPEC', String,
+           'Filter a platform for one puppet major only, as MAJOR:PLATFORM_REGEX (e.g. 9:ubuntu-20.04). ' \
+           'Emitted as a GitHub Actions matrix exclude so the platform stays in other collections. Repeatable.') do |o|
+      major, regex = o.split(':', 2)
+      raise OptionParser::InvalidArgument, "--collection-platform-exclude '#{o}' must be MAJOR:PLATFORM_REGEX" \
+        if regex.nil? || regex.empty? || major !~ /\A\d+\z/
+
+      begin
+        platform = Regexp.new(regex, Regexp::IGNORECASE)
+      rescue RegexpError => e
+        raise OptionParser::InvalidArgument, "--collection-platform-exclude '#{o}' has an invalid PLATFORM_REGEX: #{e.message}"
+      end
+      options.collection_platform_exclude << { major: major.to_i, platform: }
+    end
+
     opt.on('--arch-include REGEX', Regexp, 'Select architecture') { |o| options.arch_include << o }
     opt.on('--arch-exclude REGEX', Regexp, 'Filter architecture') { |o| options.arch_exclude << o }
 
@@ -287,21 +303,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']}",
@@ -366,6 +386,29 @@ options[:metadata]['operatingsystem_support'].each do |os_sup|
   end
 end
 
+# Exclude specific platform x collection combinations (e.g. an OS a given puppet
+# major ships no agent package for, such as ubuntu-20.04 on puppet 9). The platform
+# and collection remain valid on their own, so this is emitted as a GitHub Actions
+# matrix `exclude` that only drops the matching combinations.
+unless options[:collection_platform_exclude].empty?
+  exclude = []
+  matrix[:collection].each do |coll|
+    coll_name = coll.is_a?(Hash) ? coll[:collection] : coll
+    major = coll_name.to_s[/\d+/]&.to_i
+    next if major.nil?
+
+    matrix[:platforms].each do |platform|
+      next unless options[:collection_platform_exclude].any? do |spec|
+        spec[:major] == major && platform[:label].match?(spec[:platform])
+      end
+
+      Action.notice("collection-platform-exclude filtered #{platform[:label]} x #{coll_name}")
+      exclude << { platforms: platform, collection: coll }
+    end
+  end
+  matrix[:exclude] = exclude unless exclude.empty?
+end
+
 Action.group('matrix', matrix, pretty: true).group('spec_matrix', spec_matrix, pretty: true) if Action.type == 'github' && Action.notice
 
 Action.error('no supported puppet versions') if matrix[:collection].empty?

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.6.0'
+  VERSION = '2.8.0'
 end

data/spec/exe/fake_metadata.json

@@ -47,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

@@ -35,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 22 cells:\n  - Acceptance Test Cells: 20\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
 
@@ -79,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 20 cells:\n  - Acceptance Test Cells: 18\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
 
@@ -120,15 +120,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 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
 
@@ -159,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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'json'
 
 RSpec.describe 'matrix_from_metadata_v3' do
   let(:github_output) { Tempfile.new('github_output') }
@@ -30,7 +31,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 +42,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
 
@@ -65,7 +66,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
         '],',
         '"collection":[',
-        '"puppetcore8"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -84,7 +85,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
@@ -107,7 +108,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
         '],',
         '"collection":[',
-        '"puppetcore8"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -126,7 +127,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
@@ -148,7 +149,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"label":"Ubuntu-22.04-arm","provider":"provision_service","arch":"arm","image":"ubuntu-2204-lts-arm64","runner":"ubuntu-latest"}',
         '],',
         '"collection":[',
-        '"puppetcore8"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -168,7 +169,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
@@ -181,7 +182,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '"platforms":[',
         '],',
         '"collection":[',
-        '"puppetcore8"',
+        '"puppetcore8","puppetcore9"',
         ']',
         '}'
       ].join
@@ -205,7 +206,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
@@ -239,10 +240,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
@@ -265,7 +265,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '{"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
@@ -284,7 +284,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
@@ -330,10 +330,58 @@ 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
+
+  context 'with --collection-platform-exclude' do
+    let(:result) do
+      run_matrix_from_metadata_v3(
+        ['--collection-platform-exclude', '9:ubuntu-18.04'],
+        env: { 'PUPPET_FORGE_TOKEN' => 'fake' }
+      )
+    end
+
+    it 'runs successfully' do
+      expect(result.status_code).to eq 0
+    end
+
+    it 'emits a matrix exclude for only the matching platform x collection' do
+      result
+      matrix = JSON.parse(github_output_content[/^matrix=(.+)$/, 1])
+      expect(matrix['exclude']).to contain_exactly(
+        'platforms' => {
+          'label' => 'Ubuntu-18.04', 'provider' => 'docker', 'arch' => 'x86_64',
+          'image' => 'litmusimage/ubuntu:18.04', 'runner' => 'ubuntu-22.04'
+        },
+        'collection' => 'puppetcore9'
       )
     end
+
+    it 'keeps the platform and the collection usable in other combinations' do
+      # Ubuntu-18.04 is still a platform and puppetcore9 is still a collection;
+      # only the single pair is excluded (so Ubuntu-18.04 still runs on puppetcore8).
+      result
+      expect(github_output_content).to include('{"label":"Ubuntu-18.04","provider":"docker",')
+      expect(github_output_content).to include('"collection":["puppetcore8","puppetcore9"]')
+    end
+
+    it 'logs the exclusion' do
+      expect(result.stdout).to include('::notice::collection-platform-exclude filtered Ubuntu-18.04 x puppetcore9')
+    end
+  end
+
+  context 'with an invalid --collection-platform-exclude spec' do
+    let(:result) do
+      run_matrix_from_metadata_v3(['--collection-platform-exclude', 'ubuntu-18.04'])
+    end
+
+    it 'fails with a helpful error' do
+      expect(result.status_code).not_to eq 0
+      expect(result.stdout).to include("--collection-platform-exclude 'ubuntu-18.04' must be MAJOR:PLATFORM_REGEX")
+    end
   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.6.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-29 00:00:00.000000000 Z
+date: 2026-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt