puppet_litmus 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 071a673e5f77fa53f54031196856229f59a8869b
-  data.tar.gz: d35953f4b2d720a7f185c558ff71ea21964db698
+  metadata.gz: 8eb95d6d8c4273f6f5a8adb391bd2733a63780a6
+  data.tar.gz: d0ee040ae15c4d6e3eeffa0a87e58983647545ea
 SHA512:
-  metadata.gz: da87c6046e0eddf2873ce385a95fb772cdbc92acf62525f588d1e86f6b10b43bde52634a9a228ceb99ad3f22a48ae16c44d0f387e0c31a069e59a8e7378dc9c8
-  data.tar.gz: ca340854e2b2f81d0205c30a9a07a13343c0f75ad67879a38c405f1d5962cc427ca783a71e301d90e1804c69e0f23105eb0b4110746f0768f41d22d68a4f3d46
+  metadata.gz: 37edcc9a67e468ffb8a6de584ef74c260e430f0acc4dada0004e732ddf0b472999154302d05f3eec4fee26c33e795c65895b15442ee126af4ed754f12ceb24c7
+  data.tar.gz: 7185b48a857a1bd10a5501f85fbe6ee311a5b45f65b1ed2e9ea265a205701bd041f1dfc0c894df13fcb54567d5971012d8fabaf72c8cbfbe7cfcb3b872568a25

data/lib/puppet_litmus/rake_tasks.rb

@@ -6,6 +6,7 @@ require 'bolt_spec/run'
 require 'open3'
 require 'pdk'
 require 'json'
+require 'parallel'
 
 def get_metadata_operating_systems(metadata)
   return unless metadata.is_a?(Hash)
@@ -102,15 +103,15 @@ namespace :litmus do
     raise "Failed to provision with '#{provisioner}'\n #{failed_image_message}" unless failed_image_message.empty?
   end
 
-  desc "provision container/VM - abs/docker/vmpooler eg 'bundle exec rake 'litmus:provision[vmpooler, ubuntu-1604-x86_64]'"
+  desc "provision container/VM - abs/docker/vagrant/vmpooler eg 'bundle exec rake 'litmus:provision[vmpooler, ubuntu-1604-x86_64]'"
   task :provision, [:provisioner, :platform] do |_task, args|
     include BoltSpec::Run
     Rake::Task['spec_prep'].invoke
     config_data = { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') }
     raise "the provision module was not found in #{config_data['modulepath']}, please amend the .fixtures.yml file" unless File.directory?(File.join(config_data['modulepath'], 'provision'))
 
-    unless %w[abs vmpooler docker vagrant].include?(args[:provisioner])
-      raise "Unknown provisioner '#{args[:provisioner]}', try abs/docker/vmpooler/vagrant"
+    unless %w[abs docker docker_exp vagrant vmpooler].include?(args[:provisioner])
+      raise "Unknown provisioner '#{args[:provisioner]}', try abs/docker/vagrant/vmpooler"
     end
 
     params = { 'action' => 'provision', 'platform' => args[:platform], 'inventory' => Dir.pwd }
@@ -142,7 +143,8 @@ namespace :litmus do
     results = run_task('puppet_agent::install', targets, params, config: config_data, inventory: inventory_hash)
     results.each do |result|
       if result['status'] != 'success'
-        puts "Failed on #{result['node']}\n#{result}"
+        command_to_run = "bolt task run puppet_agent::install --targets #{result['node']} --inventoryfile inventory.yaml --modulepath #{config_data['modulepath']}"
+        puts "Failed on #{result['node']}\n#{result}\ntry running '#{command_to_run}'"
       end
     end
 
@@ -207,7 +209,7 @@ namespace :litmus do
     targets.each do |node_name|
       # how do we know what provisioner to use
       node_facts = facts_from_node(inventory_hash, node_name)
-      next unless %w[abs docker vmpooler vagrant].include?(node_facts['provisioner'])
+      next unless %w[abs docker docker_exp vagrant vmpooler].include?(node_facts['provisioner'])
 
       params = { 'action' => 'tear_down', 'node_name' => node_name, 'inventory' => Dir.pwd }
       result = run_task("provision::#{node_facts['provisioner']}", 'localhost', params, config: config_data, inventory: nil)
@@ -253,6 +255,14 @@ namespace :litmus do
             stdout, stderr, status = Open3.capture3(test)
             ["================\n#{title}\n", stdout, stderr, status]
           end
+          # because we cannot modify variables inside of Parallel
+          results.each do |result|
+            if result.last.to_i.zero?
+              success_list.push(result.first.scan(%r{.*})[2])
+            else
+              failure_list.push(result.first.scan(%r{.*})[2])
+            end
+          end
           spinner.success
         else
           spinners = TTY::Spinner::Multi.new("[:spinner] Running against #{targets.size} targets.")

data/lib/puppet_litmus/serverspec.rb

@@ -42,18 +42,7 @@ module PuppetLitmus::Serverspec
     command_to_run += " --modulepath #{Dir.pwd}/spec/fixtures/modules" if target_node_name.nil? || target_node_name == 'localhost'
     command_to_run += ' --detailed-exitcodes' if !opts[:catch_changes].nil? && (opts[:catch_changes] == true)
     command_to_run += ' --debug' if !opts[:debug].nil? && (opts[:debug] == true)
-    # BOLT-608
-    if Gem.win_platform?
-      stdout, stderr, status = Open3.capture3(command_to_run)
-      status_text = if status.to_i.zero?
-                      'success'
-                    else
-                      'failure'
-                    end
-      result = [{ 'node' => 'localhost', 'status' => status_text, 'result' => { 'exit_code' => status.to_i, 'stderr' => stderr, 'stdout' => stdout } }]
-    else
-      result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
-    end
+    result = run_command(command_to_run, target_node_name, config: nil, inventory: inventory_hash)
 
     raise "apply manifest failed\n`#{command_to_run}`\n======\n#{result}" if result.first['result']['exit_code'] != 0 && opts[:expect_failures] != true
 
@@ -64,15 +53,15 @@ module PuppetLitmus::Serverspec
     result
   end
 
-  # Creates a manifest file locally, if running against localhost create in a temp location. Or create it on the target system.
+  # Creates a manifest file locally in a temp location, if its a remote target copy it to there.
   #
   # @param manifest [String] puppet manifest code.
   # @return [String] The path to the location of the manifest.
   def create_manifest_file(manifest)
-    require 'tempfile'
-
+    require 'tmpdir'
     target_node_name = ENV['TARGET_HOST']
-    manifest_file = Tempfile.new(['manifest_', '.pp'])
+    tmp_filename = File.join(Dir.tmpdir, "manifest_#{Time.now.strftime('%Y%m%d')}_#{Process.pid}_#{rand(0x100000000).to_s(36)}.pp")
+    manifest_file = File.open(tmp_filename, 'w')
     manifest_file.write(manifest)
     manifest_file.close
     if target_node_name.nil? || target_node_name == 'localhost'
@@ -122,6 +111,10 @@ module PuppetLitmus::Serverspec
 
     raise "task failed\n`#{task_name}`\n======\n#{result}" if result.first['status'] != 'success'
 
+    result = OpenStruct.new(exit_code: result.first['result']['exit_code'],
+                            stdout: result.first['result']['stdout'],
+                            stderr: result.first['result']['stderr'])
+    yield result if block_given?
     result
   end
 end

data/lib/puppet_litmus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt