puppet_litmus 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffba803cc6b53c4bdb7084bf11be4fac807f3b3cd237c5ddb297dcf6ca3a403d
-  data.tar.gz: 5cdb613f2be957e20a63fc1250b10113e468e162817657f0f987675f2ba7c055
+  metadata.gz: 6f012bba513b46a7010b134d2ca78b733c9bdad8320e13798a4439ae1a7b43e3
+  data.tar.gz: da8f952b4faf060ffe4ec4913235e065a17019ede06437dddb0077a123d61149
 SHA512:
-  metadata.gz: ea1fd95a69bfac81b56f94f3ee28b91be2587c501bf24729931c128315e41d5eaf937dce013ee0d63ec7a350469ac32ab0d7711e50411a0e5fe00340dabdd803
-  data.tar.gz: 899ac2b0edb422ccf35c9cdb5f46bec6b2a6a97557dca12ffc994e046ed8cf1e6eec2553865a3c4439b272d1dd29b0111fc24b2e1bb93575cb77fc0bfd7606b1
+  metadata.gz: 1889d8192777dfb2e2a006c96c549e58b6c080d59a8c0279bf66ce07d048ebb03e5ce4cc694bb24e20ad37560bb19e2112e7030dad57dab8c9b8d142b1046f21
+  data.tar.gz: ffe79dd1557c4d40bc9f04eb737964cadd807c8b4f72a3615e1d13b7d6fb5e15c7c5cc8732f8e6b57aa8a36d8d370c83b6ae571ad68cfe217751cee3db3824a0

data/lib/puppet_litmus/inventory_manipulation.rb

@@ -262,7 +262,12 @@ module PuppetLitmus::InventoryManipulation
   # @param inventory_hash [Hash] hash of the inventory.yaml file
   # @param node_name [String] node of nodes to limit the search for the node_name in
   def add_platform_field(inventory_hash, node_name)
-    facts = facts_from_node(inventory_hash, node_name)
+    facts = begin
+      facts_from_node(inventory_hash, node_name)
+    rescue StandardError => e
+      warn e
+      {}
+    end
     Honeycomb.current_span.add_field('litmus.platform', facts&.dig('platform'))
   end
 end

data/lib/puppet_litmus/rake_helper.rb

@@ -192,7 +192,6 @@ module PuppetLitmus::RakeHelper
       params = if collection.nil?
                  {}
                else
-                 Honeycomb.current_span.add_field('litmus.collection', collection)
                  { 'collection' => collection }
                end
       raise "puppet_agent was not found in #{DEFAULT_CONFIG_DATA['modulepath']}, please amend the .fixtures.yml file" \
@@ -336,19 +335,24 @@ module PuppetLitmus::RakeHelper
       ENV['HTTP_X_HONEYCOMB_TRACE'] = span.to_trace_header
       # if we're only checking connectivity for a single node
       if target_node_name
-        span.add_field('litmus.node_name', target_node_name)
+        span.add_field('litmus.target_node_name', target_node_name)
         add_platform_field(inventory_hash, target_node_name)
       end
 
       include ::BoltSpec::Run
       target_nodes = find_targets(inventory_hash, target_node_name)
+      puts "Checking connectivity for #{target_nodes.inspect}"
+      span.add_field('litmus.target_nodes', target_nodes)
+
       results = run_command('cd .', target_nodes, config: nil, inventory: inventory_hash)
       span.add_field('litmus.bolt_result', results)
       failed = []
-      results.each do |result|
-        failed.push(result['target']) if result['status'] == 'failure'
+      results.reject { |r| r['status'] == 'success' }.each do |result|
+        puts "Failure connecting to #{result['target']}:\n#{result.inspect}"
+        failed.push(result['target'])
       end
-      span.add_field('litmus.connectivity_failed', failed)
+      span.add_field('litmus.connectivity_success', results.select { |r| r['status'] == 'success' })
+      span.add_field('litmus.connectivity_failure', results.reject { |r| r['status'] == 'success' })
       raise "Connectivity has failed on: #{failed}" unless failed.length.zero?
 
       true
@@ -397,4 +401,50 @@ module PuppetLitmus::RakeHelper
 
     nil
   end
+
+  def start_spinner(message)
+    if (ENV['CI'] || '').downcase == 'true'
+      puts message
+      spinner = Thread.new do
+        # CI systems are strange beasts, we only output a '.' every wee while to keep the terminal alive.
+        loop do
+          printf '.'
+          sleep(10)
+        end
+      end
+    else
+      require 'tty-spinner'
+      spinner = TTY::Spinner.new("[:spinner] #{message}")
+      spinner.auto_spin
+    end
+    spinner
+  end
+
+  def stop_spinner(spinner)
+    if (ENV['CI'] || '').downcase == 'true'
+      Thread.kill(spinner)
+    else
+      spinner.success
+    end
+  end
+
+  require 'retryable'
+
+  Retryable.configure do |config|
+    config.sleep = ->(n) { (1.5**n) + Random.rand(0.5) }
+    # config.log_method = ->(retries, exception) do
+    #   Logger.new($stdout).debug("[Attempt ##{retries}] Retrying because [#{exception.class} - #{exception.message}]: #{exception.backtrace.first(5).join(' | ')}")
+    # end
+  end
+
+  class LitmusTimeoutError < StandardError; end
+
+  def with_retries(options: { tries: Float::INFINITY }, max_wait_minutes: 5)
+    stop = Time.now + (max_wait_minutes * 60)
+    Retryable.retryable(options.merge(not: [LitmusTimeoutError])) do
+      raise LitmusTimeoutError if Time.now > stop
+
+      yield
+    end
+  end
 end

data/lib/puppet_litmus/rake_tasks.rb

@@ -36,24 +36,11 @@ namespace :litmus do
     results = []
     failed_image_message = ''
     provision_hash[args[:key]]['images'].each do |image|
-      if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
-        progress = Thread.new do
-          loop do
-            printf '.'
-            sleep(10)
-          end
-        end
-      else
-        require 'tty-spinner'
-        spinner = TTY::Spinner.new("Provisioning #{image} using #{provisioner} provisioner.[:spinner]")
-        spinner.auto_spin
-      end
-      result = provision(provisioner, image, inventory_vars)
-
-      if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
-        Thread.kill(progress)
-      else
-        spinner.success
+      begin
+        spinner = start_spinner("Provisioning #{image} using #{provisioner} provisioner.")
+        result = provision(provisioner, image, inventory_vars)
+      ensure
+        stop_spinner(spinner)
       end
 
       if result.first['status'] != 'success'
@@ -74,28 +61,35 @@ namespace :litmus do
   desc 'provision a test system using the given provisioner and platform name. See the puppetlabs-provision module tasks for more documentation'
   task :provision, [:provisioner, :platform, :inventory_vars] do |_task, args|
     Rake::Task['spec_prep'].invoke
-    if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
-      progress = Thread.new do
-        loop do
-          printf '.'
-          sleep(10)
+
+    begin
+      spinner = start_spinner("Provisioning #{args[:platform]} using #{args[:provisioner]} provisioner.")
+
+      results = provision(args[:provisioner], args[:platform], args[:inventory_vars])
+
+      unless results.first['status'] == 'success'
+        raise "Failed provisioning #{args[:platform]} using #{args[:provisioner]}\n#{results.first}"
+      end
+
+      puts "Successfully provisioned #{args[:platform]} using #{args[:provisioner]}\n"
+
+      target_names = if results.first['value']['node']
+                       [results.first['value']['node']['uri']]
+                     else
+                       results.first['value']['target_names'] || [] # provision_service multi-node provisioning
+                     end
+      target_names.each do |target|
+        Honeycomb.start_span(name: 'litmus.provision.check_connectivity') do |span|
+          span.add_field('target_name', target)
+          with_retries do
+            check_connectivity?(inventory_hash_from_inventory_file, target)
+          end
         end
       end
-    else
-      require 'tty-spinner'
-      spinner = TTY::Spinner.new("Provisioning #{args[:platform]} using #{args[:provisioner]} provisioner.[:spinner]")
-      spinner.auto_spin
-    end
-    results = provision(args[:provisioner], args[:platform], args[:inventory_vars])
-    if results.first['status'] != 'success'
-      raise "Failed provisioning #{args[:platform]} using #{args[:provisioner]}\n#{results.first}"
+    ensure
+      stop_spinner(spinner)
     end
 
-    if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
-      Thread.kill(progress)
-    else
-      spinner.success
-    end
     puts "#{results.first['value']['node_name']}, #{args[:platform]}"
   end
 
@@ -134,8 +128,10 @@ namespace :litmus do
           puts "ERROR:#{e}"
           # fix the path
           path_changes = configure_path(inventory_hash)
-          path_changes.each do |change|
-            puts "Configuring puppet path result: #{change.inspect}"
+          if ENV['DEBUG'] == true
+            path_changes.each do |change|
+              puts "Configuring puppet path result: #{change.inspect}"
+            end
           end
 
           retries += 1
@@ -362,7 +358,7 @@ namespace :litmus do
         success_list = []
         failure_list = []
         # Provision targets depending on what environment we're in
-        if (ENV['CI'] == 'true') || !ENV['DISTELLI_BUILDNUM'].nil?
+        if ENV['CI'] == 'true'
           # CI systems are strange beasts, we only output a '.' every wee while to keep the terminal alive.
           puts "Running against #{targets.size} targets.\n"
           progress = Thread.new do

data/lib/puppet_litmus/version.rb

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

data/spec/lib/puppet_litmus/rake_tasks_spec.rb

@@ -68,6 +68,9 @@ describe 'litmus rake tasks' do
 
       allow(File).to receive(:directory?).with(any_args).and_return(true)
       allow_any_instance_of(BoltSpec::Run).to receive(:run_task).with(any_args).and_return(results)
+      expect_any_instance_of(PuppetLitmus::InventoryManipulation).to receive(:inventory_hash_from_inventory_file).and_return({})
+      allow_any_instance_of(PuppetLitmus::RakeHelper).to receive(:check_connectivity?).with(any_args).and_return(true)
+      expect($stdout).to receive(:puts).with("Successfully provisioned centos:7 using docker\n")
       expect($stdout).to receive(:puts).with('localhost:2222, centos:7')
       Rake::Task['litmus:provision'].invoke('docker', 'centos:7')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Puppet, Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -90,6 +90,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +194,7 @@ homepage: https://github.com/puppetlabs/puppet_litmus
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -196,18 +210,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Providing a simple command line tool for puppet content creators, to enable
   simple and complex test deployments.
 test_files:
-- spec/spec_helper.rb
-- spec/lib/puppet_litmus/rake_tasks_spec.rb
-- spec/lib/puppet_litmus/version_spec.rb
+- spec/data/doot.tar.gz
+- spec/data/inventory.yaml
+- spec/data/jim.yaml
 - spec/lib/puppet_litmus/util_spec.rb
+- spec/lib/puppet_litmus/version_spec.rb
 - spec/lib/puppet_litmus/inventory_manipulation_spec.rb
 - spec/lib/puppet_litmus/rake_helper_spec.rb
 - spec/lib/puppet_litmus/puppet_helpers_spec.rb
-- spec/data/doot.tar.gz
-- spec/data/jim.yaml
-- spec/data/inventory.yaml
+- spec/lib/puppet_litmus/rake_tasks_spec.rb
+- spec/spec_helper.rb