kitchen-salt 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f711ec1a9e53499fabcbcfd43f13987d9b38bcb5
-  data.tar.gz: 5ce22225b656097be617e2cafcca453b43463add
+SHA256:
+  metadata.gz: e4475c3f3b756deffb4496c2fb8f7de2b883be4782351c6ddf96742aad3d756f
+  data.tar.gz: 277e089f45bb734662498288d6773d2e752e97585aa78dedaefebb6b4c6b1f06
 SHA512:
-  metadata.gz: 410f0585fe62b1fd6be86be74af64f1d1635712b18aab725eff66c112eafb9b16870fbc851f69e372daa44579ff93854ce5c6d4d7390632c43add517d3ef8568
-  data.tar.gz: 979dd2e1b87611a79c59c55d75b7eb6587ba2eed6e2617cac0c7c6d121649d0f09fbbffb4e6e4d164926e90c5505b6f94c35a595396f3db9a58e0c88d6cf63a3
+  metadata.gz: 9edcc1c724670fe20adb1e4aae236d28ec6e94033e7066b627f0b6492023cd4599ebee67b555936d9060206594421f4dc51d32d8d43128a27274d604022bc453
+  data.tar.gz: b1b2570d0309c96471773183f6be7c5ff296f207f4c61e69c101a947786a2ffe0005b11904a283405d2567f5219bc21c1d1ad361fb0262263a78b78c52ff1277

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

data/lib/kitchen/provisioner/salt_solo.rb

@@ -64,6 +64,7 @@ module Kitchen
         salt_env: 'base',
         salt_file_root: '/srv/salt',
         salt_force_color: false,
+        salt_enable_color: true,
         salt_install: 'bootstrap',
         salt_minion_config_dropin_files: [],
         salt_minion_config_template: nil,
@@ -106,7 +107,7 @@ module Kitchen
       end
 
       def install_command
-        unless config[:salt_install] == 'pip' || config[:install_after_init_environment]
+        unless not config[:salt_install] || config[:salt_install] == 'pip' || config[:install_after_init_environment]
           setup_salt
         end
       end
@@ -268,11 +269,16 @@ module Kitchen
           cmd << sudo("#{config[:root_path]}/gpgkey.sh;") if config[:gpg_key]
           salt_config_path = config[:salt_config]
         end
+
+        if config[:pre_salt_command]
+          cmd << "#{config[:pre_salt_command]} && "
+        end
         cmd << sudo("#{salt_call} --state-output=changes --config-dir=#{os_join(config[:root_path], salt_config_path)} state.highstate")
         cmd << " --log-level=#{config[:log_level]}" if config[:log_level]
         cmd << " --id=#{config[:salt_minion_id]}" if config[:salt_minion_id]
         cmd << " test=#{config[:dry_run]}" if config[:dry_run]
         cmd << ' --force-color' if config[:salt_force_color]
+        cmd << ' --no-color' if not config[:salt_enable_color]
         if "#{salt_version}" > RETCODE_VERSION || salt_version == 'latest'
           # hope for the best and hope it works eventually
           cmd << ' --retcode-passthrough'

data/lib/kitchen/verifier/nox.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+require "date"
+require "kitchen/errors"
 require "kitchen/verifier/base"
 
 module Kitchen
@@ -11,14 +13,11 @@ module Kitchen
 
       default_config :testingdir, '/testing'
       default_config :tests, []
-      default_config :transport, false
       default_config :save, {}
-      default_config :windows, false
+      default_config :windows, nil
       default_config :verbose, false
       default_config :run_destructive, false
-      default_config :ssh_tests, true
-      default_config :proxy_tests, false
-      default_config :pytest, false
+      default_config :runtests, false
       default_config :coverage, false
       default_config :junitxml, false
       default_config :from_filenames, []
@@ -26,34 +25,89 @@ module Kitchen
       default_config :passthrough_opts, []
       default_config :output_columns, 120
       default_config :sysinfo, true
+      default_config :sys_stats, false
+      default_config :environment_vars, {}
 
       def call(state)
-        info("[#{name}] Verify on instance #{instance.name} with state=#{state}")
+        if config[:windows].nil?
+          # Since windows is not set, lets try and guess since kitchen actually knows this infomation
+          if instance.platform.os_type == 'windows'
+            config[:windows] = true
+          else
+            config[:windows] = false
+          end
+        end
+        debug("Detected platform for instance #{instance.name}: #{instance.platform.os_type}. Config's windows setting value: #{config[:windows]}")
+        if (ENV['ONLY_DOWNLOAD_ARTEFACTS'] || '') == '1'
+          only_download_artefacts = true
+        else
+          only_download_artefacts = false
+        end
+        if (ENV['DONT_DOWNLOAD_ARTEFACTS'] || '') == '1'
+          dont_download_artefacts = true
+        else
+          dont_download_artefacts = false
+        end
+        if only_download_artefacts and dont_download_artefacts
+          error_msg = "The environment variables 'ONLY_DOWNLOAD_ARTEFACTS' or 'DONT_DOWNLOAD_ARTEFACTS' cannot be both set to '1'"
+          error(error_msg)
+          raise ActionFailed, error_msg
+        end
+        if only_download_artefacts
+          info("[#{name}] Only downloading artefacts from instance #{instance.name} with state=#{state}")
+        else
+          info("[#{name}] Verify on instance #{instance.name} with state=#{state}")
+        end
         root_path = (config[:windows] ? '%TEMP%\\kitchen' : '/tmp/kitchen')
         if ENV['KITCHEN_TESTS']
           ENV['KITCHEN_TESTS'].split(' ').each{|test| config[:tests].push(test)}
         end
-        noxenv = instance.suite.name
-        if config[:pytest]
-          noxenv = "pytest"
-          tests = config[:tests].join(' ')
+
+        if ENV['NOX_ENABLE_FROM_FILENAMES']
+          config[:enable_filenames] = true
+        end
+
+        if ENV['NOX_PASSTHROUGH_OPTS']
+          ENV['NOX_PASSTHROUGH_OPTS'].split(' ').each{|opt| config[:passthrough_opts].push(opt)}
+        end
+
+        if ENV['NOX_ENV_NAME']
+          noxenv = ENV['NOX_ENV_NAME']
+        elsif config[:runtests] == true
+          noxenv = "runtests-zeromq"
         else
-          noxenv = "runtests"
-          tests = config[:tests].collect{|test| "-n #{test}"}.join(' ')
+          # Default to pytest-zeromq
+          noxenv = "pytest-zeromq"
         end
-        noxenv = "#{noxenv}-#{config[:transport] ? config[:transport] : 'zeromq'}"
-        if ENV['NOX_SESSION']
-          noxenv = "#{noxenv}-#{ENV['NOX_SESSION']}"
+
+        # Is the nox env already including the Python version?
+        if not noxenv.match(/^(.*)-([\d]{1})(\.([\d]{1}))?$/)
+          # Nox env's are not py<python-version> named, they just use the <python-version>
+          # Additionally, nox envs are parametrised to enable or disable test coverage
+          # So, the line below becomes something like:
+          #   runtests-2(coverage=True)
+          #   pytest-3(coverage=False)
+          suite = instance.suite.name.gsub('py', '').gsub('2', '2.7')
+          noxenv = "#{noxenv}-#{suite}"
         end
-        # Nox env's are not py<python-version> named, they just use the <python-version>
-        # Additionally, nox envs are parametrised to enable or disable test coverage
-        # So, the line below becomes something like:
-        #   runtests-2(coverage=True)
-        #   pytest-3(coverage=False)
-        suite = instance.suite.name.gsub('py', '').gsub('2', '2.7')
-        noxenv = "#{noxenv}-#{suite}(coverage=#{config[:coverage] ? 'True' : 'False'})"
+        noxenv = "#{noxenv}(coverage=#{config[:coverage] ? 'True' : 'False'})"
 
-        if config[:enable_filenames] and ENV['CHANGE_TARGET'] and ENV['BRANCH_NAME']
+        if noxenv.include? "pytest"
+          tests = config[:tests].join(' ')
+          if config[:sys_stats]
+            sys_stats = '--sys-stats'
+            if not config[:verbose]
+              config[:verbose] = true
+            end
+          else
+            sys_stats = ''
+          end
+        elsif noxenv.include? "runtests"
+          tests = config[:tests].collect{|test| "-n #{test}"}.join(' ')
+          sys_stats = ''
+        end
+
+        if config[:enable_filenames] and ENV['CHANGE_TARGET'] and ENV['BRANCH_NAME'] and ENV['FORCE_FULL'] != 'true'
           require 'git'
           repo = Git.open(Dir.pwd)
           config[:from_filenames] = repo.diff("origin/#{ENV['CHANGE_TARGET']}",
@@ -62,17 +116,19 @@ module Kitchen
 
         if config[:junitxml]
           junitxml = File.join(root_path, config[:testingdir], 'artifacts', 'xml-unittests-output')
-          if config[:pytest]
-            junitxml = "--junitxml=#{File.join(junitxml, 'test-results.xml')}"
+          if noxenv.include? "pytest"
+            junitxml = "--junitxml=#{File.join(junitxml, "test-results-#{DateTime.now.strftime('%Y%m%d%H%M%S.%L')}.xml")}"
           else
             junitxml = "--xml=#{junitxml}"
           end
         end
 
         # Be sure to copy the remote artifacts directory to the local machine
-        save = {
-          "#{File.join(root_path, config[:testingdir], 'artifacts')}" => "#{Dir.pwd}/"
-        }
+        if config[:windows]
+          save = {'$env:KitchenTestingDir/artifacts/' => "#{Dir.pwd}"}
+        else
+          save = {"#{File.join(root_path, config[:testingdir], 'artifacts')}/" => "#{Dir.pwd}"}
+        end
         # Hash insert order matters, that's why we define a new one and merge
         # the one from config
         save.merge!(config[:save])
@@ -83,57 +139,88 @@ module Kitchen
           (config[:windows] ? "-e #{noxenv}" : "-e '#{noxenv}'"),
           '--',
           "--output-columns=#{config[:output_columns]}",
+          sys_stats,
           (config[:sysinfo] ? '--sysinfo' : ''),
           (config[:junitxml] ? junitxml : ''),
-          (config[:windows] ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
           (config[:verbose] ? '-vv' : '-v'),
-          (config[:run_destructive] ? "--run-destructive" : ''),
-          (config[:ssh_tests] ? "--ssh-tests" : ''),
-          (config[:proxy_tests] ? "--proxy-tests" : ''),
+          (config[:run_destructive] ? '--run-destructive' : ''),
           config[:passthrough_opts].join(' '),
-          (config[:from_filenames].any? ? "--from-filenames=#{config[:from_filenames].join(',')}" : ''),
-          tests,
         ].join(' ')
+
+        if tests.nil? || tests.empty?
+          # If we're not targetting specific tests...
+          extra_command = [
+            (config[:from_filenames].any? ? "--from-filenames=#{config[:from_filenames].join(',')}" : ''),
+            (config[:windows] ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
+          ].join(' ')
+          command = "#{command} #{extra_command}"
+        else
+          command = "#{command} #{tests}"
+        end
+
+        environment_vars = {}
+        if ENV['CI'] || ENV['DRONE'] || ENV['JENKINS_URL']
+          environment_vars['CI'] = 1
+        end
+        # Hash insert order matters, that's why we define a new one and merge
+        # the one from config
+        environment_vars.merge!(config[:environment_vars])
+
         if config[:windows]
           command = "cmd.exe /c --% \"#{command}\" 2>&1"
         end
-        info("Running Command: #{command}")
         instance.transport.connection(state) do |conn|
           begin
             if config[:windows]
               conn.execute('$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")')
-              conn.execute("$env:PythonPath = [Environment]::ExpandEnvironmentVariables(\"#{root_path}\\testing\")")
+              conn.execute("$env:PythonPath = [Environment]::ExpandEnvironmentVariables(\"#{File.join(root_path, config[:testingdir])}\")")
+              conn.execute("[Environment]::SetEnvironmentVariable(\"KitchenTestingDir\", [Environment]::ExpandEnvironmentVariables(\"#{File.join(root_path, config[:testingdir])}\"), \"Machine\")")
+              environment_vars.each do |key, value|
+                conn.execute("[Environment]::SetEnvironmentVariable(\"#{key}\", \"#{value}\", \"Machine\")")
+              end
             else
+              command_env = []
+              environment_vars.each do |key, value|
+                command_env.push("#{key}=#{value}")
+              end
+              if not command_env.empty?
+                command = "env #{command_env.join(' ')} #{command}"
+              end
               begin
                 conn.execute(sudo("chown -R $USER #{root_path}"))
               rescue => e
                 error("Failed to chown #{root_path} :: #{e}")
               end
             end
-            begin
+            if not only_download_artefacts
+              info("Running Command: #{command}")
               conn.execute(sudo(command))
-            rescue => e
-              info("Verify command failed :: #{e}")
             end
           ensure
-            save.each do |remote, local|
-              unless config[:windows]
+            if not dont_download_artefacts
+              save.each do |remote, local|
+                unless config[:windows]
+                  begin
+                    conn.execute(sudo("chmod -R +r #{remote}"))
+                  rescue => e
+                    error("Failed to chown #{remote} :: #{e}")
+                  end
+                end
                 begin
-                  conn.execute(sudo("chmod -R +r #{remote}"))
+                  info("Copying #{remote} to #{local}")
+                  conn.download(remote, local)
                 rescue => e
-                  error("Failed to chown #{remote} :: #{e}")
+                  error("Failed to copy #{remote} to #{local} :: #{e}")
                 end
               end
-              begin
-                info("Copying #{remote} to #{local}")
-                conn.download(remote, local)
-              rescue => e
-                error("Failed to copy #{remote} to #{local} :: #{e}")
-              end
             end
           end
         end
-        debug("[#{name}] Verify completed.")
+        if only_download_artefacts
+          info("[#{name}] Download artefacts completed.")
+        else
+          debug("[#{name}] Verify completed.")
+        end
       end
     end
   end

data/lib/kitchen/verifier/runtests.rb

@@ -22,6 +22,7 @@ module Kitchen
       default_config :windows, false
       default_config :enable_filenames, false
       default_config :from_filenames, []
+      default_config :prepend, false
 
       def call(state)
         info("[#{name}] Verify on instance #{instance.name} with state=#{state}")
@@ -29,12 +30,13 @@ module Kitchen
         if ENV['KITCHEN_TESTS']
           ENV['KITCHEN_TESTS'].split(' ').each{|test| config[:tests].push(test)}
         end
-        if config[:enable_filenames] and ENV['CHANGE_TARGET'] and ENV['BRANCH_NAME']
+        if config[:enable_filenames] and ENV['CHANGE_TARGET'] and ENV['BRANCH_NAME'] and ENV['FORCE_FULL'] != 'true'
           require 'git'
           repo = Git.open('.')
-	  config[:from_filenames] = repo.diff("origin/#{ENV['CHANGE_TARGET']}", "origin/#{ENV['BRANCH_NAME']}").name_status.keys.select{|file| file.end_with?('.py')}
+          config[:from_filenames] = repo.diff("origin/#{ENV['CHANGE_TARGET']}", "origin/#{ENV['BRANCH_NAME']}").name_status.keys.select{|file| file.end_with?('.py')}
         end
         command = [
+          (config[:prepend] ? "#{config[:prepend]}" : ''),
           (config[:windows] ? 'python.exe' : config[:python_bin]),
           File.join(root_path, config[:testingdir], '/tests/runtests.py'),
           '--sysinfo',
@@ -47,7 +49,7 @@ module Kitchen
           (config[:xml] ? "--xml=#{config[:xml]}" : ''),
           config[:types].collect{|type| "--#{type}"}.join(' '),
           config[:tests].collect{|test| "-n #{test}"}.join(' '),
-	  (config[:from_filenames].any? ? "--from-filenames=#{config[:from_filenames].join(',')}" : ''),
+          (config[:from_filenames].any? ? "--from-filenames=#{config[:from_filenames].join(',')}" : ''),
           '2>&1',
         ].join(' ')
         if config[:windows]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -181,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: salt provisioner for test-kitchen