puppet_litmus 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6aae4d826162090c6d1d7b05df110263b1d77b77879e72623529912a0948fb
-  data.tar.gz: b1d98ca5cad46e027ab1a0c15fdb37ae3e49b8dc70ddf423f2f34ec05e784e7b
+  metadata.gz: 8481f68695821e0c43b5f940fc3d3923a591d9eea517b584c68ac89a4a2d8705
+  data.tar.gz: cc2c8065859e96290760d4320d701dc8cfb367041360b5287eda12a9fdf9eb45
 SHA512:
-  metadata.gz: 33254eeeb62d7be13711ee6941a666141715a07f7f3ecf37fb9dc3983403345b6880f4ff060b37b16b83ef7e5ab173982d4323be82af6aa720e59b7fe037f29c
-  data.tar.gz: a06db9fc523e6c6a586ff852cb60769313eb0dfb4be435f24f24038fda950fa87536b8f51248f8d7f36ed431189242f4d57f8dfdf8793d4c0f28d56244b7027a
+  metadata.gz: 9aefe6ab00559d2a6726626e4d2d3819025565c152624c0c42e88c1a2c323c1b025540fbca5bd64a110b7947682f5fe173ea6788425be6c5512e7653ef6eeee0
+  data.tar.gz: 11f0c2f06e8be551a2c7efdd262256fa3f90fb5942576c2665d4064a23357a1a20081baa81983fcdd1e39832a1c7a0f3e84a999bf35c12386cf26ebbe9c31201

data/lib/puppet_litmus/rake_helper.rb

@@ -142,6 +142,17 @@ module PuppetLitmus::RakeHelper
 
     # 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|
+      params = {
+        'path' => '/opt/puppetlabs/bin'
+      }
+      node_facts = facts_from_node(inventory_hash, target)
+      next unless node_facts['provisioner'] == 'vagrant'
+
+      puts "Adding puppet agent binary to the secure_path on target #{target}."
+      result = run_task('provision::fix_secure_path', target, params, config: DEFAULT_CONFIG_DATA, inventory: inventory_hash.clone)
+      raise_bolt_errors(result, "Failed to add the Puppet agent binary to the secure_path on target #{target}.")
+    end
     raise_bolt_errors(bolt_result, 'Installation of agent failed.')
     bolt_result
   end

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.1'
+  VERSION = '1.1.3'
 end

metadata

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