puppet_litmus 0.22.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09a793d09382a0f461b0390ebb71f94ae4a14df41873d44a77f2006ee15934bf'
-  data.tar.gz: eced3b1aceb10d8fc85f90dd15ab3cfc300f793b85e2f516548510d59bd9ab4c
+  metadata.gz: 228833b61d086ab7b01341ce03eb1169c309855209ca8a1345d55525fbe6403b
+  data.tar.gz: 9e1f9a8f180f047bf49ac493b00871294bf22adccc134fbea6aa7c46fa8b6769
 SHA512:
-  metadata.gz: b2226c90e2928e78e44ab3faf2ff837da356934ea89768637b7943c32d615b3c04ff605a00063dff6ad24126ac5e9a43f2e86f16c6385132bbc9c4ba7a27b82e
-  data.tar.gz: 5651ff30427d4f96b72440c28458251e00c4c595df98a602130fa95aec6f18c1f5d378d2a737ece3c918367cd38933f7aa615733ffc0c5ee77e6240f4fd82db8
+  metadata.gz: efc5c864bf1781678e2cfd729bbbe2e5bdbe1f0eb03b244f135d892629c6e404aa01c1290fb001bb5616f8149800ff05e55fb57abb78b4f2041d1539ab18864d
+  data.tar.gz: 1b12e3fcd6b1d9def5040c720a543a44df317538dcfe9058930a205412c709ff6160215edacaa4f6c22e6c2223b543d9f6d7ccc884b059ce849c5c83ce3079e1

data/exe/matrix_from_metadata

@@ -6,7 +6,6 @@
 require 'json'
 
 IMAGE_TABLE = {
-  'RedHat-6' => 'rhel-6',
   'RedHat-7' => 'rhel-7',
   'RedHat-8' => 'rhel-8',
   'SLES-12' => 'sles-12',
@@ -36,9 +35,8 @@ DOCKER_PLATFORMS = [
 # This table uses the latest version in each collection for accurate
 # comparison when evaluating puppet requirements from the metadata
 COLLECTION_TABLE = {
-  '5.5.22' => 'puppet5',
-  '6.19.1' => 'puppet6-nightly',
-  '7.0.0' => 'puppet7-nightly',
+  '6.21.0' => 'puppet6-nightly',
+  '7.4.0' => 'puppet7-nightly',
 }.freeze
 
 matrix = {

data/exe/matrix_from_metadata_v2

@@ -0,0 +1,105 @@
+#!/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'
+
+IMAGE_TABLE = {
+  'RedHat-7' => 'rhel-7',
+  'RedHat-8' => 'rhel-8',
+  '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-6' => 'litmusimage/centos:6',
+  'CentOS-7' => 'litmusimage/centos:7',
+  'CentOS-8' => 'litmusimage/centos:8',
+  'Debian-10' => 'litmusimage/debian:10',
+  # 'Debian-8' => 'litmusimage/debian:8', Removing from testing: https://puppet.com/docs/pe/2021.0/supported_operating_systems.html
+  'Debian-9' => 'litmusimage/debian:9',
+  'OracleLinux-6' => 'litmusimage/oraclelinux:6',
+  'OracleLinux-7' => 'litmusimage/oraclelinux:7',
+  'Scientific-6' => 'litmusimage/scientificlinux:6',
+  'Scientific-7' => 'litmusimage/scientificlinux:7',
+  # 'Ubuntu-14.04' => 'litmusimage/ubuntu:14.04', Removing from testing: https://puppet.com/docs/pe/2021.0/supported_operating_systems.html
+  'Ubuntu-16.04' => 'litmusimage/ubuntu:16.04',
+  'Ubuntu-18.04' => 'litmusimage/ubuntu:18.04',
+  'Ubuntu-20.04' => 'litmusimage/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.24.0' => 'puppet6-nightly',
+  '7.4.0' => 'puppet7-nightly',
+}.freeze
+
+matrix = {
+  platforms: [],
+  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 { |a| a.to_i }.each do |ver|
+    image_key = "#{os}-#{ver}"
+    if IMAGE_TABLE.key? image_key
+      matrix[:platforms] << {
+        label: image_key,
+        provider: 'provision::provision_service',
+        image: IMAGE_TABLE[image_key],
+      }
+    elsif DOCKER_PLATFORMS.key? image_key
+      matrix[:platforms] << {
+        label: image_key,
+        provider: 'provision::docker',
+        image: DOCKER_PLATFORMS[image_key],
+      }
+    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 = %r{^([>=<]{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|
+      if Gem::Requirement.create(reqs).satisfied_by?(Gem::Version.new(key))
+        matrix[:collection] << val
+      end
+    end
+  end
+end
+
+# Set to defaults (all collections) if no matches are found
+if matrix[:collection].empty?
+  matrix[:collection] = COLLECTION_TABLE.values
+end
+
+# Just to make sure there aren't any duplicates
+matrix[:platforms] = matrix[:platforms].uniq.sort { |a, b| a[:label] <=> b[:label] }
+matrix[:collection] = matrix[:collection].uniq.sort
+
+puts "::set-output name=matrix::#{JSON.generate(matrix)}"
+
+puts "Created matrix with #{matrix[:platforms].length * matrix[:collection].length} cells."

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -17,10 +17,7 @@ module PuppetLitmus::InventoryManipulation
                           end
     raise "There is no inventory file at '#{inventory_full_path}'." unless File.exist?(inventory_full_path)
 
-    inventory_hash = YAML.load_file(inventory_full_path)
-    raise "Inventory file is incompatible (version 2 and up). Try the 'bolt project migrate' command." if inventory_hash['version'].nil? || (inventory_hash['version'] < 2)
-
-    inventory_hash
+    YAML.load_file(inventory_full_path)
   end
 
   # Provide a default hash for executing against localhost
@@ -28,7 +25,6 @@ module PuppetLitmus::InventoryManipulation
   # @return [Hash] inventory.yaml hash containing only an entry for localhost
   def localhost_inventory_hash
     {
-      'version' => 2,
       'groups' => [
         {
           'name' => 'local',

data/lib/puppet_litmus/puppet_helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # helper functions for running puppet commands. They execute a target system specified by ENV['TARGET_HOST']
-# heavily uses functions from here https://github.com/puppetlabs/bolt/blob/master/developer-docs/bolt_spec-run.md
+# heavily uses functions from here https://github.com/puppetlabs/bolt/blob/main/developer-docs/bolt_spec-run.md
 module PuppetLitmus::PuppetHelpers
   # Applies a manifest twice. First checking for errors. Secondly to make sure no changes occur.
   #
@@ -11,7 +11,7 @@ module PuppetLitmus::PuppetHelpers
     Honeycomb.start_span(name: 'litmus.idempotent_apply') do |span|
       ENV['HONEYCOMB_TRACE'] = span.to_trace_header
       manifest_file_location = create_manifest_file(manifest)
-      apply_manifest(nil, expect_failures: false, manifest_file_location: manifest_file_location)
+      apply_manifest(nil, catch_failures: true, manifest_file_location: manifest_file_location)
       apply_manifest(nil, catch_changes: true, manifest_file_location: manifest_file_location)
     end
   end
@@ -83,18 +83,21 @@ module PuppetLitmus::PuppetHelpers
       command_to_run += ' --noop' if !opts[:noop].nil? && (opts[:noop] == true)
       command_to_run += ' --detailed-exitcodes' if use_detailed_exit_codes == true
 
-      command_to_run = "try { #{command_to_run}; exit $LASTEXITCODE } catch { write-error $_ ; exit 1 }" if os[:family] == 'windows'
-
-      span.add_field('litmus.command_to_run', command_to_run)
       span.add_field('litmus.target_node_name', target_node_name)
-      # IAC-1365 - Workaround for BOLT-1535 and bolt issue #1650
-      # bolt_result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
-      bolt_result = Tempfile.open(['temp', '.ps1']) do |script|
-        script.write(command_to_run)
-        script.close
-        run_script(script.path, target_node_name, [], options: {}, config: nil, inventory: inventory_hash)
-      end
 
+      if os[:family] == 'windows'
+        # IAC-1365 - Workaround for BOLT-1535 and bolt issue #1650
+        command_to_run = "try { #{command_to_run}; exit $LASTEXITCODE } catch { write-error $_ ; exit 1 }"
+        span.add_field('litmus.command_to_run', command_to_run)
+        bolt_result = Tempfile.open(['temp', '.ps1']) do |script|
+          script.write(command_to_run)
+          script.close
+          run_script(script.path, target_node_name, [], options: {}, config: nil, inventory: inventory_hash)
+        end
+      else
+        span.add_field('litmus.command_to_run', command_to_run)
+        bolt_result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
+      end
       span.add_field('litmus.bolt_result', bolt_result)
       result = OpenStruct.new(exit_code: bolt_result.first['value']['exit_code'],
                               stdout: bolt_result.first['value']['stdout'],

data/lib/puppet_litmus/version.rb

@@ -2,5 +2,5 @@
 
 # version of this gem
 module PuppetLitmus
-  VERSION ||= '0.22.0'
+  VERSION ||= '0.25.1'
 end

data/spec/lib/puppet_litmus/rake_tasks_spec.rb

@@ -16,7 +16,7 @@ describe 'litmus rake tasks' do
                    'operatingsystem_support' =>
   [{ 'operatingsystem' => 'RedHat', 'operatingsystemrelease' => ['5'] },
    { 'operatingsystem' => 'Ubuntu', 'operatingsystemrelease' => ['14.04', '18.04'] }],
-                   'template-ref' => 'heads/master-0-g7827fc2' }
+                   'template-ref' => 'heads/main-0-g7827fc2' }
       expect(File).to receive(:read).with(any_args).once
       expect(JSON).to receive(:parse).with(any_args).and_return(metadata)
       expect($stdout).to receive(:puts).with('redhat-5-x86_64')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Puppet, Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -166,12 +166,14 @@ email:
 - info@puppet.com
 executables:
 - matrix_from_metadata
+- matrix_from_metadata_v2
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - exe/matrix_from_metadata
+- exe/matrix_from_metadata_v2
 - lib/puppet_litmus.rb
 - lib/puppet_litmus/inventory_manipulation.rb
 - lib/puppet_litmus/puppet_helpers.rb
@@ -194,7 +196,7 @@ homepage: https://github.com/puppetlabs/puppet_litmus
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Providing a simple command line tool for puppet content creators, to enable
   simple and complex test deployments.