puppet_litmus 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4433a55c5c24b484d53d1584036b0bc8371f784dd762ce92eaff928ae984cb66
-  data.tar.gz: '08c533a7048dce835a3af639dad0c5f481533fd50be36739c0a0be416e450634'
+  metadata.gz: 8a30baea9597240441a67b27c36f17d535c33db12b4099359b56bd812e756cbc
+  data.tar.gz: cb7f0aa263b87db882ab890f1c3c0b7629b26cc77210f74a94d708b9002875c2
 SHA512:
-  metadata.gz: c52c6c1b0fa3908ecc2dda5bbc4502e0acc4e03c3eb41704f20a729acfa04f13abd3c8c1ede9f38ba69ea6476d0e32eb3870e36db1862c94dd0195dd79e3dc9b
-  data.tar.gz: 44c24366269ac536d2089a3051099c2deeb1312f2b2e73ef64d99a2b9d2348abd0a173a4f65150ba19ffc56e1f7d3264dc1ca81796b278908c93222603b07804
+  metadata.gz: 8c8f045fd86d51b30319f30f56d0b3f472c9904e4400e89c35b21fce606d7b627c32f4a8e4d31abfe48d873dea040023aebcfb84cbacf4edf64198eb1e07442d
+  data.tar.gz: 1724f3326553387aaeeb8310980a242cc4cd047bd8ef3ae0b9ae12f10c677ea1db720484833750e7226ddaaa930288c8e0e79c56dc68b649b4f4a772e8c66f98

data/README.md

@@ -27,25 +27,36 @@ Litmus also facilitates parallel test runs and running tests in isolation. Each
 
 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 strutcture you define exists.
+- Note if you choose to override the `litmus_inventory.yaml` location, please ensure that the directory structure you define exists.
 
 ## matrix_from_metadata_v2
 
-matrix_from_metadata_v2 tool generates github actions matrix from metadata.json
+matrix_from_metadata_v2 tool generates a github action matrix from the supported operating systems listed in the module's metadata.json.
 
-How to use it: in the project module root directory run `bundle exec matrix_from_metadata_v2`
+How to use it:
+in the project module root directory run `bundle exec matrix_from_metadata_v2`
 
 ### --exclude-platforms parameter
 
-matrix_from_metadata_v2 accepts `--exclude-platforms <JSON array>` option in order to exclude some platforms from GA matrixes.
+matrix_from_metadata_v2 accepts the `--exclude-platforms <JSON array>` argument in order to exclude some platforms from the matrix.
 
-In order to use this new functionality just simply run:
+For example:
 
 `$: bundle exec matrix_from_metadata_v2 --exclude-platforms '["debian-11","centos-8"]'`
 
 > Note: The option value should be JSON string otherwise it will throw an error.
 > The values provided in the json array are case-insensitive `["debian-11","centos-8"]'` or `["Debian-11","CentOS-8"]'` are treated as being the same.
 
+### --custom-matrix parameter
+
+matrix_from_metadata_v2 accepts the `--custom-matrix /path/to/matrix.json` argument in order to execute your test suite against a custom matrix. This is useful for use cases that do not fit the default matrix generated.
+
+In order to use this new functionality, run:
+
+`$: bundle exec matrix_from_metadata_v2 --custom-matrix matrix.json`
+
+> Note: The file should contain a valid Array of JSON Objects (i.e. `[{"label":"AlmaLinux-8","provider":"provision_service","image":"almalinux-cloud/almalinux-8"}, {..}]`), otherwise it will throw an error.
+
 ## Documentation
 
 For documentation, see our [Litmus Docs Site](https://puppetlabs.github.io/content-and-tooling-team/docs/litmus/).

data/lib/puppet_litmus/rake_helper.rb

@@ -98,7 +98,8 @@ module PuppetLitmus::RakeHelper
 
     results = {}
     targets.each do |node_name|
-      next if node_name == 'litmus_localhost'
+      #  next if local host or provisioner fact empty/not set (GH-421)
+      next if node_name == 'litmus_localhost' || facts_from_node(inventory_hash, node_name)['provisioner'].nil?
 
       result = tear_down(node_name, inventory_hash)
       # Some provisioners tear_down targets that were created as a batch job.
@@ -327,7 +328,7 @@ module PuppetLitmus::RakeHelper
   end
 
   def start_spinner(message)
-    if (ENV['CI'] || '').casecmp('true').zero?
+    if (ENV['CI'] || '').casecmp('true').zero? || Gem.win_platform?
       puts message
       spinner = Thread.new do
         # CI systems are strange beasts, we only output a '.' every wee while to keep the terminal alive.
@@ -345,7 +346,7 @@ module PuppetLitmus::RakeHelper
   end
 
   def stop_spinner(spinner)
-    if (ENV['CI'] || '').casecmp('true').zero?
+    if (ENV['CI'] || '').casecmp('true').zero? || Gem.win_platform?
       Thread.kill(spinner)
     else
       spinner.success

data/lib/puppet_litmus/rake_tasks.rb

@@ -75,6 +75,8 @@ namespace :litmus do
   task :provision, [:provisioner, :platform, :inventory_vars] do |_task, args|
     Rake::Task['spec_prep'].invoke
 
+    retry_count = 3
+    current_retry_count = 0
     begin
       spinner = start_spinner("Provisioning #{args[:platform]} using #{args[:provisioner]} provisioner.")
 
@@ -94,6 +96,13 @@ namespace :litmus do
           check_connectivity?(inventory_hash_from_inventory_file, target)
         end
       end
+    rescue PuppetLitmus::RakeHelper::LitmusTimeoutError
+      current_retry_count += 1
+      Rake::Task['litmus:tear_down'].invoke(target_names.first)
+      raise if current_retry_count > retry_count
+
+      puts "Provision of node #{target_names.first} failed, Retrying #{current_retry_count} of #{retry_count}"
+      retry
     ensure
       stop_spinner(spinner)
     end

data/lib/puppet_litmus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt