puppet_litmus 1.6.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972d1bfa360c9c0312d67dbeee0cc61fb6024b74a6464e1ce538033d9e8bd4e1
-  data.tar.gz: 54aaa27bf44f594ec09ba46e9067223d4b467d9a1723393c64c026d8cb6b7480
+  metadata.gz: 9351e4016b6c6d4f394ac28c0f97e0b6c815963f8e387beb9d56c9358bd2f797
+  data.tar.gz: ca62cf15ef208854e897e6109c65c09a4d9a1913290c15f2a2340e9b6ec073ab
 SHA512:
-  metadata.gz: 9bfb060fd3c53b16167df18162c1a9a0a02a9cb0185161b321cf7ac349fe8fc6f425e9f458a56d29da6907dbcd80afa102689c1c00e7a32fe74107d48f14e82e
-  data.tar.gz: 212218938af470ff6bb2422801f9a6b8d6050acdd2d3bee4cd4c2c2a2837dea8b4334dfc58163734809821a4f24681fa70f63f2ee07dff4701045e92dbf3eb5a
+  metadata.gz: a817ad015da1eda9b9abb01b43d882653895d4f6b992e705eddf36dbd43d27b13305cc5c37a7f104b7458b59248add0f0d2e3f0b7a5b42d3c097e370b107d3ec
+  data.tar.gz: d1ed5ca355583f9ea58e78c88f21bf32de414ffe2732cd81002bc7fce8099920d37a2690a026f87e469fa048f30140f58caa8a3e2264a63a534094d127d19528

data/README.md

@@ -29,6 +29,24 @@ Install Litmus as a gem by running `gem install puppet_litmus`.
 
 - Note if you choose to override the `litmus_inventory.yaml` location, please ensure that the directory structure you define exists.
 
+## Agent installs
+
+### Install a specific puppet agent version
+
+To install a specific version of the puppet agent, you can export the `PUPPET_VERSION` env var, like below:
+```
+export PUPPET_VERSION=8.8.1
+```
+
+When set, the `litmus:install_agent` rake task will install the specified version. The default is `latest`.
+
+## Installing puppetcore agents
+
+To install a puppetcore puppet agent through the `litmus:install_agent` rake task, you need to export your Forge API key as an env var, like below:
+```
+export PUPPET_FORGE_TOKEN='<your_forge_api_key>'
+```
+
 ## matrix_from_metadata_v3
 
 matrix_from_metadata_v3 tool generates a github action matrix from the supported operating systems listed in the module's metadata.json.

data/exe/matrix.json

@@ -1,9 +1,5 @@
 {
     "collections": [
-        {
-            "puppet": 7.24,
-            "ruby": 2.7
-        },
         {
             "puppet": 8.0,
             "ruby": 3.2
@@ -90,7 +86,7 @@
     },
     "github_runner": {
         "docker": {
-            "^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|Ubuntu-18|Debian-10)": "ubuntu-20.04"
+            "^(AmazonLinux-2|(CentOS|OracleLinux|Scientific)-7|Ubuntu-18|Debian-10)": "ubuntu-22.04"
         }
     }
 }

data/exe/matrix_from_metadata_v2

@@ -217,7 +217,7 @@ if metadata.key?('requirements') && metadata['requirements'].length.positive?
       # 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::Requirement.create(reqs).satisfied_by?(Gem::Version.new("#{collection[:puppet_maj_version]}.9999"))
 
-      matrix[:collection] << "puppet#{collection[:puppet_maj_version]}-nightly"
+      matrix[:collection] << "puppetcore#{collection[:puppet_maj_version]}"
 
       include_version = {
         8 => "~> #{collection[:puppet_maj_version]}.0",
@@ -229,6 +229,7 @@ if metadata.key?('requirements') && metadata['requirements'].length.positive?
   end
 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?
 # Just to make sure there aren't any duplicates

data/exe/matrix_from_metadata_v3

@@ -260,7 +260,7 @@ 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] << "puppet#{collection['puppet'].to_i}-nightly"
+    matrix[:collection] << "puppetcore#{collection['puppet'].to_i}"
 
     spec_matrix[:include] << {
       puppet_version: "~> #{collection['puppet']}",
@@ -308,10 +308,10 @@ options[:metadata]['operatingsystem_support'].each do |os_sup|
         end
 
         os_ver_platforms << {
-          label: label,
+          label:,
           provider: provisioner,
-          arch: arch,
-          image: image,
+          arch:,
+          image:,
           runner: runner.nil? ? options[:runner] : runner
         }
       end
@@ -330,7 +330,7 @@ Action.group('matrix', matrix, pretty: true).group('spec_matrix', spec_matrix, p
 Action.error('no supported puppet versions') if matrix[:collection].empty?
 
 if Action.type == 'stdout'
-  $stdout.puts JSON.generate({ matrix: matrix, spec_matrix: spec_matrix })
+  $stdout.puts JSON.generate({ matrix:, spec_matrix: })
 else
   Action.set_output('matrix', matrix).set_output('spec_matrix', spec_matrix)
 end

data/lib/puppet_litmus/puppet_helpers.rb

@@ -20,8 +20,8 @@ module PuppetLitmus::PuppetHelpers
   # @return [Boolean] The result of the 2 apply manifests.
   def idempotent_apply(manifest, opts = {})
     manifest_file_location = create_manifest_file(manifest)
-    apply_manifest(nil, **opts, catch_failures: true, manifest_file_location: manifest_file_location)
-    apply_manifest(nil, **opts, catch_changes: true, manifest_file_location: manifest_file_location)
+    apply_manifest(nil, **opts, catch_failures: true, manifest_file_location:)
+    apply_manifest(nil, **opts, catch_changes: true, manifest_file_location:)
   end
 
   # Applies a manifest. returning the result of that apply. Mimics the apply_manifest from beaker
@@ -230,7 +230,7 @@ module PuppetLitmus::PuppetHelpers
       target_node_name = search_for_target(target_option, inventory_hash)
     end
 
-    bolt_result = upload_file(source, destination, target_node_name, options: options, config: nil, inventory: inventory_hash)
+    bolt_result = upload_file(source, destination, target_node_name, options:, config: nil, inventory: inventory_hash)
 
     result_obj = {
       exit_code: 0,

data/lib/puppet_litmus/rake_helper.rb

@@ -4,7 +4,7 @@ require 'bolt_spec/run'
 require 'puppet_litmus/version'
 
 # helper methods for the litmus rake tasks
-module PuppetLitmus::RakeHelper
+module PuppetLitmus::RakeHelper # rubocop:disable Metrics/ModuleLength
   # DEFAULT_CONFIG_DATA should be frozen for our safety, but it needs to work around https://github.com/puppetlabs/bolt/pull/1696
   DEFAULT_CONFIG_DATA = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') } # .freeze # rubocop:disable Style/MutableConstant
   SUPPORTED_PROVISIONERS = %w[abs docker docker_exp lxd provision_service vagrant vmpooler].freeze
@@ -129,14 +129,19 @@ module PuppetLitmus::RakeHelper
 
   def install_agent(collection, targets, inventory_hash)
     include ::BoltSpec::Run
-    params = if collection.nil?
-               {}
-             else
-               { 'collection' => collection }
-             end
+    puppet_version = ENV.fetch('PUPPET_VERSION', nil)
+    forge_token = ENV.fetch('PUPPET_FORGE_TOKEN', nil)
+    params = {}
+    params['password'] = forge_token if forge_token
+    params['collection'] = collection  if collection
+    params['version'] = puppet_version if puppet_version
+
     raise "puppet_agent was not found in #{DEFAULT_CONFIG_DATA['modulepath']}, please amend the .fixtures.yml file" \
       unless File.directory?(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'puppet_agent'))
 
+    raise 'puppetcore agent installs require a valid PUPPET_FORGE_TOKEN set in the env.' \
+        if collection =~ /\Apuppetcore.*/ && !forge_token
+
     # 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|

data/lib/puppet_litmus/spec_helper_acceptance.rb

@@ -88,9 +88,9 @@ module PuppetLitmus
         endpoint.path = '/wsman'
 
         opts = {
-          user: user,
+          user:,
           password: pass,
-          endpoint: endpoint,
+          endpoint:,
           operation_timeout: 300
         }
 

data/lib/puppet_litmus/version.rb

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

data/spec/exe/matrix_from_metadata_v2_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
           '],',
           '"collection":[',
-          '"puppet7-nightly","puppet8-nightly"',
+          '"puppetcore7","puppetcore8"',
           ']',
           '}'
         ].join
@@ -75,7 +75,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
           '],',
           '"collection":[',
-          '"puppet7-nightly","puppet8-nightly"',
+          '"puppetcore7","puppetcore8"',
           ']',
           '}'
         ].join
@@ -114,7 +114,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '{"label":"Ubuntu-22.04-arm","provider":"provision_service","image":"ubuntu-2204-lts-arm64"}',
           '],',
           '"collection":[',
-          '"puppet7-nightly","puppet8-nightly"',
+          '"puppetcore7","puppetcore8"',
           ']',
           '}'
         ].join
@@ -153,7 +153,7 @@ RSpec.describe 'matrix_from_metadata_v2' do
           '{"label":"Ubuntu-22.04","provider":"docker","image":"litmusimage/ubuntu:22.04"}',
           '],',
           '"collection":[',
-          '"puppet7-nightly","puppet8-nightly"',
+          '"puppetcore7","puppetcore8"',
           ']',
           '}'
         ].join

data/spec/exe/matrix_from_metadata_v3_spec.rb

@@ -24,13 +24,13 @@ RSpec.describe 'matrix_from_metadata_v3' do
       matrix = [
         'matrix={',
         '"platforms":[',
-        '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
-        '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
-        '{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},',
+        '{"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":"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"}',
         '],',
         '"collection":[',
-        '"puppet7-nightly","puppet8-nightly"',
+        '"puppetcore8"',
         ']',
         '}'
       ].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":"~> 7.24","ruby_version":2.7},{"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}]}')
     end
   end
 
@@ -53,17 +53,17 @@ RSpec.describe 'matrix_from_metadata_v3' do
       [
         'matrix={',
         '"platforms":[',
-        '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
-        '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
+        '{"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-20.04"},',
+        '{"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":[',
-        '"puppet7-nightly","puppet8-nightly"',
+        '"puppetcore8"',
         ']',
         '}'
       ].join
@@ -82,7 +82,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":"~> 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}]}'
       )
     end
   end
@@ -93,17 +93,17 @@ RSpec.describe 'matrix_from_metadata_v3' do
       [
         'matrix={',
         '"platforms":[',
-        '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
-        '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
+        '{"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-20.04"},',
+        '{"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":[',
-        '"puppet7-nightly","puppet8-nightly"',
+        '"puppetcore8"',
         ']',
         '}'
       ].join
@@ -122,7 +122,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":"~> 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}]}'
       )
     end
   end
@@ -133,8 +133,8 @@ RSpec.describe 'matrix_from_metadata_v3' do
       [
         'matrix={',
         '"platforms":[',
-        '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
-        '{"label":"AmazonLinux-2023","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2023","runner":"ubuntu-20.04"},',
+        '{"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"},',
@@ -142,7 +142,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":[',
-        '"puppet7-nightly","puppet8-nightly"',
+        '"puppetcore8"',
         ']',
         '}'
       ].join
@@ -162,7 +162,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":"~> 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}]}'
       )
     end
   end
@@ -175,7 +175,7 @@ RSpec.describe 'matrix_from_metadata_v3' do
         '"platforms":[',
         '],',
         '"collection":[',
-        '"puppet7-nightly","puppet8-nightly"',
+        '"puppetcore8"',
         ']',
         '}'
       ].join
@@ -198,7 +198,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":"~> 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}]}'
       )
     end
   end
@@ -209,13 +209,13 @@ RSpec.describe 'matrix_from_metadata_v3' do
       [
         'matrix={',
         '"platforms":[',
-        '{"label":"AmazonLinux-2","provider":"docker","arch":"x86_64","image":"litmusimage/amazonlinux:2","runner":"ubuntu-20.04"},',
+        '{"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-20.04"},',
-        '{"label":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},',
+        '{"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"}',
         '],',
         '"collection":[',
-        '"puppet7-nightly","puppet8-nightly"',
+        '"puppetcore8"',
         ']',
         '}'
       ].join
@@ -233,10 +233,10 @@ 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","puppet7-nightly","puppet8-nightly"'
+        '"collection":["2023.8.0-puppet_enterprise","2021.7.9-puppet_enterprise","puppetcore8"'
       )
       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}]}'
       )
     end
   end

data/spec/lib/puppet_litmus/rake_helper_spec.rb

@@ -131,13 +131,34 @@ RSpec.describe PuppetLitmus::RakeHelper do
           [{ 'uri' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
     end
     let(:targets) { ['some.host'] }
-    let(:params) { { 'collection' => 'puppet6' } }
+    let(:token) { 'some_token' }
+    let(:params) { { 'collection' => 'puppet6', '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)
     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')
+      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)
+    end
+
+    it 'fails for puppetcore if no token supplied' do
+      params = { 'collection' => 'puppetcore7' }
+      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\./)
+    end
   end
 
   context 'with install_module' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Puppet, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -126,7 +126,6 @@ email:
 - info@puppet.com
 executables:
 - matrix.json
-- matrix_from_metadata
 - matrix_from_metadata_v2
 - matrix_from_metadata_v3
 extensions: []
@@ -135,7 +134,6 @@ files:
 - LICENSE
 - README.md
 - exe/matrix.json
-- exe/matrix_from_metadata
 - exe/matrix_from_metadata_v2
 - exe/matrix_from_metadata_v3
 - lib/puppet_litmus.rb
@@ -165,7 +163,7 @@ homepage: https://github.com/puppetlabs/puppet_litmus
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,15 +171,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Providing a simple command line tool for puppet content creators, to enable
   simple and complex test deployments.

data/exe/matrix_from_metadata

@@ -1,112 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# this script creates a build matrix for github actions from the claimed supported platforms and puppet versions in metadata.json
-
-require 'json'
-
-# Sets an output variable in GitHub Actions. If the GITHUB_OUTPUT environment
-# variable is not set, this will fail with an exit code of 1 and
-# send an ::error:: message to the GitHub Actions log.
-# @param name [String] The name of the output variable
-# @param value [String] The value of the output variable
-
-def set_output(name, value)
-  # Get the output path
-  output = ENV.fetch('GITHUB_OUTPUT')
-
-  # Write the output variable to GITHUB_OUTPUT
-  File.open(output, 'a') do |f|
-    f.puts "#{name}=#{value}"
-  end
-rescue KeyError
-  puts '::error::GITHUB_OUTPUT environment variable not set.'
-  exit 1
-end
-
-IMAGE_TABLE = {
-  'RedHat-7' => 'rhel-7',
-  'RedHat-8' => 'rhel-8',
-  'RedHat-9' => 'rhel-9',
-  'RedHat-9-arm' => 'rhel-9-arm64',
-  'SLES-12' => 'sles-12',
-  'SLES-15' => 'sles-15',
-  'Windows-2012 R2' => 'windows-2012-r2-core',
-  'Windows-2016' => 'windows-2016',
-  'Windows-2019' => 'windows-2019-core'
-}.freeze
-
-DOCKER_PLATFORMS = [
-  'CentOS-7',
-  'CentOS-8',
-  'Debian-10',
-  'Debian-8',
-  'Debian-9',
-  'OracleLinux-6',
-  'OracleLinux-7',
-  'Scientific-6',
-  'Scientific-7',
-  'Ubuntu-14.04',
-  'Ubuntu-16.04',
-  'Ubuntu-18.04',
-  'Ubuntu-20.04'
-].freeze
-
-# This table uses the latest version in each collection for accurate
-# comparison when evaluating puppet requirements from the metadata
-COLLECTION_TABLE = {
-  '6.21.0' => 'puppet6-nightly',
-  '7.4.0' => 'puppet7-nightly'
-}.freeze
-
-matrix = {
-  platform: [],
-  collection: []
-}
-
-metadata = JSON.parse(File.read('metadata.json'))
-# Set platforms based on declared operating system support
-metadata['operatingsystem_support'].sort_by { |a| a['operatingsystem'] }.each do |sup|
-  os = sup['operatingsystem']
-  sup['operatingsystemrelease'].sort_by(&:to_i).each do |ver|
-    image_key = "#{os}-#{ver}"
-    if IMAGE_TABLE.key? image_key
-      matrix[:platform] << IMAGE_TABLE[image_key]
-    elsif DOCKER_PLATFORMS.include? image_key
-      puts "Expecting #{image_key} test using docker on travis"
-    else
-      puts "::warning::Cannot find image for #{image_key}"
-    end
-  end
-end
-
-# Set collections based on puppet version requirements
-if metadata.key?('requirements') && metadata['requirements'].length.positive?
-  metadata['requirements'].each do |req|
-    next unless req.key?('name') && req.key?('version_requirement') && req['name'] == 'puppet'
-
-    ver_regexp = /^([>=<]{1,2})\s*([\d.]+)\s+([>=<]{1,2})\s*([\d.]+)$/
-    match = ver_regexp.match(req['version_requirement'])
-    if match.nil?
-      puts "::warning::Didn't recognize version_requirement '#{req['version_requirement']}'"
-      break
-    end
-
-    cmp_one, ver_one, cmp_two, ver_two = match.captures
-    reqs = ["#{cmp_one} #{ver_one}", "#{cmp_two} #{ver_two}"]
-
-    COLLECTION_TABLE.each do |key, val|
-      matrix[:collection] << val if Gem::Requirement.create(reqs).satisfied_by?(Gem::Version.new(key))
-    end
-  end
-end
-
-# Set to defaults (all collections) if no matches are found
-matrix[:collection] = COLLECTION_TABLE.values if matrix[:collection].empty?
-
-# Just to make sure there aren't any duplicates
-matrix[:platform] = matrix[:platform].uniq.sort
-matrix[:collection] = matrix[:collection].uniq.sort
-
-set_output('matrix', JSON.generate(matrix))
-puts "Created matrix with #{matrix[:platform].length * matrix[:collection].length} cells."