puppet_litmus 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8484d287566c6611244f1048285e745ef1ec33c8e06ff6ebea0e517c2bf82647
-  data.tar.gz: 56e1065ea8aabd7851266745f4ccf2ca95c21548b32f7b246835397dc60b28a3
+  metadata.gz: c30427123e4564bc48f1ab51d5ba1a309d51a92cfaa960ca879cf0bc9646b811
+  data.tar.gz: 0c84f4661ece76aa2c69e375c7c82b0a2c8eef4d9b644edd6e50c516e3eb2b5b
 SHA512:
-  metadata.gz: 4d0a8be65d7c13e095479366ba95b7b22bbbeb5518f1fc2da7ede5e248e3e9ae3e3e3a82a388134cb29ab3641ce71b5d189b733cc459f1f7dcb91522e5ad9f49
-  data.tar.gz: d55c84b38566630694ac2605aff7ecd769a2d8e218a70ec26c70dc6c855ab128420757fbd19bc87d69cfdb01dbada14b65cd34c7ffe4da8eb066d336f8df11e8
+  metadata.gz: b188680048a9f7c9aa78f579555cf2ce892b74a9dbf03d7463a6f12f097b17db4dcde1fb0173c1037e1817a9cc423cf948c2888c18cf141499dd57adcc9607bf
+  data.tar.gz: bd2df6cd288d01181384eb9ecd943b3f508d8c5262062acb4cbe88c1b694c578e435769fc067cbaea0032c3e224f9b8193485cab34f3aaa75e91d8dfed9d31ea

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',
+  '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',
+  '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/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.
   #

data/lib/puppet_litmus/version.rb

@@ -2,5 +2,5 @@
 
 # version of this gem
 module PuppetLitmus
-  VERSION ||= '0.24.0'
+  VERSION ||= '0.25.0'
 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.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-02-25 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