puppet_litmus 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5f589532820aa9325ab3653f0f02868f0127feb8d18c7b129c64c4358ce2c3
-  data.tar.gz: 66246c52058e285899fd523803dd32a0e097c7eef34c15e5f7a3b7525f1b2775
+  metadata.gz: 53b43f12e2dd8f46fc1f041080b9bde92d16bb310995321017600683d0c870bf
+  data.tar.gz: dbc6ca5c092d8cfca91784cbd67561ce10d588eeb83633862ce8f26b763c082f
 SHA512:
-  metadata.gz: 545df42c21e51cba530a74efd86d7275399190a1d3ebb5be20017eae10ac9d90ba71c92eb7c5a290dd5eed6221c955e83bcc539611d8bdcedda16d06ea61118c
-  data.tar.gz: fd36021b42b2d7ad2502c85394f767317f05561d37ab2bde05d38adf45d667cb045ea9c736b41518bd6dc5e54f48287069802a1e0253adebb6c4a0dbb77e36bc
+  metadata.gz: fca2f16bbde0eb8893e216c3aa4de040a4f2aa014175531d6c9b74c71f33bab8c4d9d16f49556a7e09c42e45ced0c5dfecf0169def6df243b47826feaafd1d48
+  data.tar.gz: 33bd34e230c46e92612a91f075088969c2eab1bd65c0c36a345222c9c44f838e240959030ed1c2c0cc05da3251aa024904a54da2fb4f8ce33865494ec5c18e6a

data/exe/matrix.json

@@ -40,7 +40,8 @@
             },
             "Ubuntu": {
                 "20.04": { "x86_64": "ubuntu-2004-lts" },
-                "22.04": { "x86_64": "ubuntu-2204-lts", "arm": "ubuntu-2204-lts-arm64" }
+                "22.04": { "x86_64": "ubuntu-2204-lts", "arm": "ubuntu-2204-lts-arm64" },
+                "24.04": { "x86_64": "ubuntu-2404-lts", "arm": "ubuntu-2404-lts-arm64" }
             },
             "Windows": {
                 "2016": { "x86_64": "windows-2016" },
@@ -82,7 +83,8 @@
             "Ubuntu": {
                 "18.04": { "x86_64": "litmusimage/ubuntu:18.04" },
                 "20.04": { "x86_64": "litmusimage/ubuntu:20.04" },
-                "22.04": { "x86_64": "litmusimage/ubuntu:22.04" }
+                "22.04": { "x86_64": "litmusimage/ubuntu:22.04" },
+                "24.04": { "x86_64": "litmusimage/ubuntu:24.04" }
             }
         }
     },

data/exe/matrix_from_metadata_v2

@@ -38,7 +38,8 @@ IMAGE_TABLE = {
 ARM_IMAGE_TABLE = {
   'Debian-12-arm' => 'debian-12-arm64',
   'RedHat-9-arm' => 'rhel-9-arm64',
-  'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64'
+  'Ubuntu-22.04-arm' => 'ubuntu-2204-lts-arm64',
+  'Ubuntu-24.04-arm' => 'ubuntu-2404-lts-arm64'
 }.freeze
 
 DOCKER_PLATFORMS = {
@@ -60,7 +61,8 @@ DOCKER_PLATFORMS = {
   'Scientific-7' => 'litmusimage/scientificlinux:7',
   'Ubuntu-18.04' => 'litmusimage/ubuntu:18.04',
   'Ubuntu-20.04' => 'litmusimage/ubuntu:20.04',
-  'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04'
+  'Ubuntu-22.04' => 'litmusimage/ubuntu:22.04',
+  'Ubuntu-24.04' => 'litmusimage/ubuntu:24.04'
 }.freeze
 
 # This table uses the latest version in each collection for accurate
@@ -119,7 +121,8 @@ if ARGV.include?('--provision-service')
     'Debian-11' => 'debian-11',
     'Debian-12' => 'debian-12',
     'Ubuntu-20.04' => 'ubuntu-2004-lts',
-    'Ubuntu-22.04' => 'ubuntu-2204-lts'
+    'Ubuntu-22.04' => 'ubuntu-2204-lts',
+    'Ubuntu-24.04' => 'ubuntu-2404-lts'
   }
   updated_list = IMAGE_TABLE.dup.clone
   updated_list.merge!(updated_platforms)

data/exe/matrix_from_metadata_v3

@@ -147,6 +147,8 @@ begin
 
     opt.on('--runner NAME', String, "Default Github action runner (default: #{default_options[:runner]})") { |o| options.runner = o }
 
+    opt.on('--pe-include', TrueClass, 'Include Puppet Enterprise LTS') { |o| options.pe_include = o }
+
     opt.on('--puppet-include MAJOR', Integer, 'Select puppet major version') { |o| options.puppet_include << o }
     opt.on('--puppet-exclude MAJOR', Integer, 'Filter puppet major version') { |o| options.puppet_exclude << o }
 
@@ -219,6 +221,27 @@ options[:metadata]['requirements']&.each do |req|
     break
   end
 
+  gem_req = Gem::Requirement.create(puppet_version_reqs)
+
+  # Add PE LTS to the collection matrix
+  if options[:pe_include]
+    require 'puppet_forge'
+
+    PuppetForge.user_agent = 'Puppet/Litmus'
+
+    forge_conn = PuppetForge::Connection.make_connection('https://forge.puppet.com')
+    pe_tracks = forge_conn.get('/private/versions/pe')
+    lts_tracklist = pe_tracks.body.select { |ver| ver[:lts] == true }
+
+    lts_tracklist.each do |track|
+      if gem_req.satisfied_by?(Gem::Version.new(track[:versions][0][:puppet].to_s))
+        matrix[:collection] << "#{track[:latest]}-puppet_enterprise"
+      else
+        Action.debug("PE #{track[:latest]} (puppet v#{track[:versions][0][:puppet]}) outside requirements #{puppet_version_reqs}")
+      end
+    end
+  end
+
   options[:matrix]['collections'].each do |collection|
     next unless options[:puppet_include].each do |major|
       break if major != collection['puppet'].to_i
@@ -235,7 +258,6 @@ options[:metadata]['requirements']&.each do |req|
 
     # Test against the "largest" puppet version in a collection, e.g. `7.9999` to allow puppet requirements with a non-zero lower bound on minor/patch versions.
     # 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.
-    gem_req = Gem::Requirement.create(puppet_version_reqs)
     next unless gem_req.satisfied_by?(Gem::Version.new("#{collection['puppet'].to_i}.9999"))
 
     matrix[:collection] << "puppet#{collection['puppet'].to_i}-nightly"

data/lib/puppet_litmus/rake_tasks.rb

@@ -128,6 +128,7 @@ namespace :litmus do
     Rake::Task['spec_prep'].invoke
 
     results = install_agent(args[:collection], targets, inventory_hash)
+    target_index = 0
     results.each do |result|
       command_to_run = "bolt task run puppet_agent::install --targets #{result['target']} --inventoryfile spec/fixtures/litmus_inventory.yaml --modulepath #{DEFAULT_CONFIG_DATA['modulepath']}"
       raise "Failed on #{result['target']}\n#{result}\ntry running '#{command_to_run}'" if result['status'] != 'success'
@@ -157,7 +158,8 @@ namespace :litmus do
       end
 
       # add puppet-agent feature to successful nodes
-      inventory_hash = add_feature_to_node(inventory_hash, 'puppet-agent', result['target'])
+      inventory_hash = add_feature_to_node(inventory_hash, 'puppet-agent', targets[target_index])
+      target_index += 1
     end
 
     # update the inventory with the puppet-agent feature set per node

data/lib/puppet_litmus/version.rb

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

data/spec/exe/matrix_from_metadata_v3_spec.rb

@@ -202,4 +202,42 @@ RSpec.describe 'matrix_from_metadata_v3' do
       )
     end
   end
+
+  context 'with --pe-include' do
+    let(:result) { run_matrix_from_metadata_v3(['--puppetlabs', '--pe-include']) }
+    let(:matrix) 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":"Ubuntu-18.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:18.04","runner":"ubuntu-20.04"},',
+        '{"label":"Ubuntu-22.04","provider":"docker","arch":"x86_64","image":"litmusimage/ubuntu:22.04","runner":"ubuntu-latest"}',
+        '],',
+        '"collection":[',
+        '"puppet7-nightly","puppet8-nightly"',
+        ']',
+        '}'
+      ].join
+    end
+
+    it 'run successfully' do
+      expect(result.status_code).to eq 0
+    end
+
+    it 'generates the matrix with PE LTS versions' 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(
+        '"collection":["2023.8.0-puppet_enterprise","2021.7.9-puppet_enterprise","puppet7-nightly","puppet8-nightly"'
+      )
+      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}]}'
+      )
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt