kitchen-salt 0.0.29 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59e051d229d33983d4f1ff8d7f4f092a5e5808af
-  data.tar.gz: 3fc7174b04e097267d2fa49854f51abe5f0d3d45
+SHA256:
+  metadata.gz: 603063a5f1b59537f46424ca4cd62cdadc7fcd2a666ca00137592f9d8fc82bc6
+  data.tar.gz: 2ad2433565df3ad9d109094f10dbad63bc13246a15ced4dbbd52ab51ed25e8a9
 SHA512:
-  metadata.gz: 77590fa2bbc1f1fe17f1a2b1f1f20de2fbe86df9bb5c4e321a8a4d9e91bc9bc6bbd978e5e9f74fb6592286026325fb62acbbf6034fe4c96650635828ea90a8a0
-  data.tar.gz: 9ab055a9ac8a3dee16f1f5adbce36279035196f9516e0f01489b357c3ce7e92c4472c9a10474b5cbe653e7a9593d2f13eb472570909d21c9df0116a8cdbc08a3
+  metadata.gz: 970af9e45fb7c8adadcfede939438bcfc5a37b9aafd42cb2b0214e9ae9192a4cb6cac409bf56c1a5001e52fb8da2222adfbc5faad6a661e28c04014cd41f134a
+  data.tar.gz: 46172738dc22bdcd461a75a4d44f8462fe5dc265cc4aad1d5e687e79fef7bfb90c26ca479331167f8212d8e15e9d29c02a40899f0a57ec849f4bf3e3b74b2443

data/lib/kitchen-salt/states.rb

@@ -32,11 +32,12 @@ module Kitchen
       def prepare_states
         if config[:state_collection] || config[:is_file_root] || !config[:local_salt_root].nil?
           prepare_state_collection
+        elsif config[:remote_states]
+          prepare_remote_states
         else
           prepare_formula config[:kitchen_root], config[:formula]
           prepare_vendor_states
         end
-
       end
 
       def prepare_vendor_states
@@ -102,6 +103,21 @@ module Kitchen
         FileUtils.mkdir_p(collection_dir)
         cp_r_with_filter(states_location, collection_dir, config[:salt_copy_filter])
       end
+
+      def prepare_remote_states
+        info('Preparing remote states')
+        remoteconf = config[:remote_states]
+        if remoteconf[:repo] == 'git'
+          debug("Cloning #{remoteconf[:name]}")
+          require 'git'
+          repo = Git.clone(remoteconf[:name], File.join(sandbox_path, config[:salt_file_root]), opts={:branch => remoteconf[:branch]})
+        end
+        if remoteconf[:testingdir]
+          dest = File.join(sandbox_path, remoteconf[:testingdir])
+          FileUtils.mkdir_p(dest)
+          cp_r_with_filter(config[:kitchen_root], dest, config[:salt_copy_filter])
+        end
+      end
     end
   end
 end

data/lib/kitchen-salt/util.rb

@@ -47,6 +47,8 @@ module Kitchen
             FileUtils.cp_r "#{source}/.", target if File.symlink? source
           elsif filtered
             debug("Found #{source} in #{filter}, not copying file")
+          elsif File.symlink? source
+            FileUtils.symlink File.readlink(source), target
           else
             FileUtils.copy source, target
           end

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.0.29'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/lib/kitchen/provisioner/dependencies.erb

@@ -9,6 +9,7 @@ def install_dependencies
 
     export SALT_ROOT="#{config[:root_path]}/#{config[:salt_file_root]}";
     export SALT_SHARE_DIR='/usr/share/salt-formulas'
+    export DEBIAN_FRONTEND=noninteractive
 
     mkdir -p "${SALT_ROOT}";
     mkdir -p "${SALT_SHARE_DIR}";

data/lib/kitchen/provisioner/formula-fetch.sh

@@ -51,7 +51,9 @@ function fetchGitFormula() {
           fi
           # install dependencies
           FETCHED+=($name)
-          fetchDependencies "$GIT_FORMULAS_PATH/$name/metadata.yml"
+          if [ -e "$GIT_FORMULAS_PATH/$name/metadata.yml" ]; then
+            fetchDependencies "$GIT_FORMULAS_PATH/$name/metadata.yml"
+          fi
         fi
     else
         echo Usage: fetchGitFormula "<git repo>" "[local formula directory name]" "[branch]"

data/lib/kitchen/provisioner/install.erb

@@ -10,6 +10,14 @@ salt_yum_rpm_key = config[:salt_yum_rpm_key] % [salt_version]
 salt_yum_repo = config[:salt_yum_repo] % [salt_version]
 salt_yum_repo_key = config[:salt_yum_repo_key] % [salt_version]
 salt_yum_repo_latest = config[:salt_yum_repo_latest]
+salt_pip_pkg = config[:pip_install]
+salt_pip_bin = config[:pip_bin]
+salt_pip_install_command = ' install'
+salt_pip_install_command += ' -e' if config[:pip_editable]
+salt_pip_install_command += ' --index-url ' + config[:pip_index_url] if config[:pip_index_url]
+config[:pip_extra_index_url].each do |url|
+  salt_pip_install_command += ' --extra-index-url ' + url
+end
 
 <<-INSTALL
 sh -c '
@@ -19,12 +27,20 @@ sh -c '
 command -v salt-call >/dev/null 2>&1 && SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
 command -v locale-gen >/dev/null 2>&1 && #{sudo('locale-gen')} en_US.UTF-8
 set +x
-
+export DEBIAN_FRONTEND=noninteractive
 
 if [ -z "${SALT_VERSION}" -a "#{salt_install}" = "bootstrap" ]
 then
-  do_download #{salt_url} /tmp/bootstrap-salt.sh
-  #{sudo('sh')} /tmp/bootstrap-salt.sh #{bootstrap_options}
+  mkdir -p "#{config[:root_path]}"
+  BOOTSTRAP="#{config[:root_path]}/bootstrap.sh"
+  if ! test -f $BOOTSTRAP; then
+      do_download #{salt_url} "$BOOTSTRAP"
+  fi
+  #{sudo('sh')} $BOOTSTRAP #{bootstrap_options}
+elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "pip" ]
+then
+  echo #{sudo(salt_pip_bin)} #{salt_pip_install_command} #{salt_pip_pkg}
+  #{sudo(salt_pip_bin)} #{salt_pip_install_command} #{salt_pip_pkg}
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "apt" ]
 then
   if [ ! $(command -v lsb_release &>/dev/null) ]; then
@@ -46,18 +62,15 @@ then
   #{sudo('apt-get')} update
   sleep 10
   echo "-----> Installing salt-minion (#{salt_version})"
-  #{sudo('apt-get')} install -y python-support
   #{sudo('apt-get')} install -y salt-minion salt-common salt-master
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "distrib" ]
 then
   #{sudo('apt-get')} update
-  #{sudo('apt-get')} install -y python-support
   #{sudo('apt-get')} install -y salt-minion salt-master
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "ppa" ]
 then
   #{sudo('apt-add-repository')} -y #{salt_ppa}
   #{sudo('apt-get')} update
-  #{sudo('apt-get')} install -y python-support
   #{sudo('apt-get')} install -y salt-minion salt-common salt-master
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "yum" ]
 then

data/lib/kitchen/provisioner/minion.erb

@@ -1,3 +1,4 @@
+# @markup text
 local: true
 state_top: top.sls
 root_dir: <%= config[:root_path] %>

data/lib/kitchen/provisioner/salt_solo.rb

@@ -54,12 +54,13 @@ module Kitchen
         salt_pillar_root: '/srv/pillar',
         salt_spm_root: '/srv/spm',
         salt_state_top: '/srv/salt/top.sls',
+        salt_force_color: false,
         state_collection: false,
         state_top: {},
         state_top_from_file: false,
-        salt_run_highstate: true,
         salt_copy_filter: [],
         is_file_root: false,
+        remote_states: nil,
         require_chef: true,
         dependencies: [],
         vendor_path: nil,
@@ -70,7 +71,13 @@ module Kitchen
         salt_yum_rpm_key: 'https://repo.saltstack.com/yum/redhat/7/x86_64/archive/%s/SALTSTACK-GPG-KEY.pub',
         salt_yum_repo: 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/%s',
         salt_yum_repo_key: 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/%s/SALTSTACK-GPG-KEY.pub',
-        salt_yum_repo_latest: 'https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm'
+        salt_yum_repo_latest: 'https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm',
+        pip_pkg: 'salt==%s',
+        pip_editable: false,
+        pip_index_url: 'https://pypi.python.org/simple/',
+        pip_extra_index_url: [],
+        pip_bin: 'pip',
+        install_after_init_environment: false,
       }
 
       # salt-call version that supports the undocumented --retcode-passthrough command
@@ -81,6 +88,18 @@ module Kitchen
       end
 
       def install_command
+        unless config[:salt_install] == 'pip' || config[:install_after_init_environment]
+          setup_salt
+        end
+      end
+
+      def prepare_command
+        if config[:salt_install] == 'pip' || config[:install_after_init_environment]
+          setup_salt
+        end
+      end
+
+      def setup_salt
         debug(diagnose)
         salt_version = config[:salt_version]
 
@@ -145,6 +164,7 @@ module Kitchen
       def create_sandbox
         super
         prepare_data
+        prepare_install
         prepare_minion
         prepare_pillars
         prepare_grains
@@ -154,6 +174,32 @@ module Kitchen
         prepare_dependencies
       end
 
+      def prepare_install
+        salt_version = config[:salt_version]
+        if config[:salt_install] == 'pip'
+          debug("Using pip to install")
+          if File.exist?(config[:pip_pkg])
+            debug("Installing with pip from sdist")
+            sandbox_pip_path = File.join(sandbox_path, 'pip')
+            FileUtils.mkdir_p(sandbox_pip_path)
+            FileUtils.cp_r(config[:pip_pkg], sandbox_pip_path)
+            config[:pip_install] = File.join(config[:root_path], 'pip', File.basename(config[:pip_pkg]))
+          else
+            debug("Installing with pip from download")
+            if salt_version != 'latest'
+              config[:pip_install] = config[:pip_pkg] % [salt_version]
+            else
+              config[:pip_pkg].slice!('==%s')
+              config[:pip_install] = config[:pip_pkg]
+            end
+          end
+        elsif config[:salt_install] == 'bootstrap'
+          if File.exists?(config[:salt_bootstrap_url])
+            FileUtils.cp_r(config[:salt_bootstrap_url], File.join(sandbox_path, 'bootstrap.sh'))
+          end
+        end
+      end
+
       def init_command
         debug("Initialising Driver #{name}")
         if windows_os?
@@ -186,6 +232,7 @@ module Kitchen
         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]
         if salt_version > RETCODE_VERSION || salt_version == 'latest'
           # hope for the best and hope it works eventually
           cmd << ' --retcode-passthrough'

data/lib/kitchen/verifier/runtests.rb

@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+
+require "kitchen/verifier/base"
+
+module Kitchen
+  module Verifier
+    class Runtests < Kitchen::Verifier::Base
+      kitchen_verifier_api_version 1
+
+      plugin_version Kitchen::VERSION
+
+      default_config :testingdir, '/testing'
+      default_config :python_bin, 'python2'
+      default_config :verbose, false
+      default_config :run_destructive, false
+      default_config :xml, false
+      default_config :coverage_xml, false
+      default_config :types, []
+      default_config :tests, []
+      default_config :transport, false
+      default_config :save, {}
+      default_config :windows, false
+
+      def call(state)
+        info("[#{name}] Verify on instance #{instance.name} with state=#{state}")
+        root_path = (config[:windows] ? '$env:TEMP\\kitchen' : '/tmp/kitchen')
+        command = [
+          (config[:windows] ? 'python.exe' : config[:python_bin]),
+          File.join(root_path, config[:testingdir], '/tests/runtests.py'),
+          '--sysinfo',
+          '--output-columns=80',
+          (config[:windows] ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
+          (config[:transport] ? "--transport=#{config[:transport]}" : ''),
+          (config[:verbose] ? '-v' : ''),
+          (config[:run_destructive] ? "--run-destructive" : ''),
+          (config[:coverage_xml] ? "--coverage-xml=#{config[:coverage_xml]}" : ''),
+          (config[:xml] ? "--xml=#{config[:xml]}" : ''),
+          config[:types].collect{|type| "--#{type}"}.join(' '),
+          config[:tests].collect{|test| "-n #{test}"}.join(' '),
+        ].join(' ')
+        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")')
+            end
+            conn.execute(sudo(command))
+          ensure
+            config[:save].each do |remote, local|
+              unless config[:windows]
+                conn.execute(sudo("chmod -R +r #{remote}"))
+              end
+              info("Copying #{remote} to #{local}")
+              conn.download(remote, local)
+            end
+          end
+        end
+        debug("[#{name}] Verify completed.")
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.1.0
 platform: ruby
 authors:
 - SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -52,6 +52,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: salt provisioner for test-kitchen so that you can test all the things
 email:
 - daniel@gtmanfred.com
@@ -71,6 +127,7 @@ files:
 - lib/kitchen/provisioner/repository-setup.sh
 - lib/kitchen/provisioner/salt_solo.rb
 - lib/kitchen/provisioner/spm.erb
+- lib/kitchen/verifier/runtests.rb
 homepage: https://github.com/saltstack/kitchen-salt
 licenses:
 - Apache-2.0
@@ -91,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: salt provisioner for test-kitchen