kitchen-dokken 2.7.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 430a35ea6cfd6b64127fcaa56964ccd46fc856fb8d2711e40e1c1e35a6dbdccc
-  data.tar.gz: a63f9d33388c8eec1d029458cafbb7379379522cad387bd78f1166b60a9e0c54
+  metadata.gz: 1cf6fdff38752942d8eb2ec416874255a581ce4d2e7607aa0aa10eccbe5c7c1e
+  data.tar.gz: 5389972a3d453448c9206995302a76b6880ddfd39919cfd4f35661db83feb8f4
 SHA512:
-  metadata.gz: 18431ecd5008ce194b6f6dd64d590fb7c97594e9d0c287e54bb6263d3a88a553023da5d112f4e5a1c206b4a58dea699d8b01f7025a8d8fd9f8b051e409693f73
-  data.tar.gz: '09c7a44c4c6a5e06be8296e545a02a49d0d09a6c0c0540891b7e36e875ce6484de01dd7f33c91bcbaf66310f64414de1b61f57177d733e080549dc31bc3a385e'
+  metadata.gz: 1c49b83d7bd26b2bd0e9feac76c6e36d70938ccb9e6e5a032c8fdb86ce2e28fae6f7fcee1687963035bbee34fd92ac92e9014ed08af7f7b12e812cf13af8eecb
+  data.tar.gz: 1983818b9795b4af4294e585f58a0fd88ff048a8d2ca3ca28a39c279a063ba298526d9275258ec8ab9b8af38c8953b2dd468e7faa674fcf8de47add995a04b8a

data/lib/kitchen/driver/dokken.rb

@@ -436,6 +436,9 @@ module Kitchen
       rescue
         with_retries do
           begin
+            args['Env'] = [] if args['Env'].nil?
+            args['Env'] << 'TEST_KITCHEN=1'
+            args['Env'] << "CI=#{ENV['CI']}" if ENV.include? 'CI'
             info "Creating container #{args['name']}"
             debug "driver - create_container args #{args}"
             with_retries do

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.7.0'.freeze
+    DOKKEN_VERSION = '2.9.1'.freeze
   end
 end

data/lib/kitchen/provisioner/dokken.rb

@@ -30,7 +30,7 @@ module Kitchen
       plugin_version Kitchen::VERSION
 
       default_config :root_path, '/opt/kitchen'
-      default_config :chef_binary, '/opt/chef/embedded/bin/chef-client'
+      default_config :chef_binary, '/opt/chef/bin/chef-client'
       default_config :chef_options, ' -z'
       default_config :chef_log_level, 'warn'
       default_config :chef_output_format, 'doc'
@@ -50,10 +50,12 @@ module Kitchen
         driver = provisioner.instance.driver
         driver[:chef_version]
       end
+      default_config :clean_dokken_sandbox, true
 
       # (see Base#call)
       def call(state)
         create_sandbox
+        write_run_command(run_command)
         instance.transport.connection(state) do |conn|
           if remote_docker_host?
             info("Transferring files to #{instance.to_str}")
@@ -62,7 +64,7 @@ module Kitchen
 
           conn.execute(prepare_command)
           conn.execute_with_retry(
-            run_command,
+            "sh #{config[:root_path]}/run_command",
             config[:retry_on_exit_code],
             config[:max_retries],
             config[:wait_for_retry]
@@ -71,6 +73,7 @@ module Kitchen
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message
       ensure
+        return unless config[:clean_dokken_sandbox]
         cleanup_dokken_sandbox
       end
 
@@ -103,6 +106,12 @@ module Kitchen
         cmd << " -F #{config[:chef_output_format]}"
         cmd << ' -c /opt/kitchen/client.rb'
         cmd << ' -j /opt/kitchen/dna.json'
+
+        chef_cmd(cmd)
+      end
+
+      def write_run_command(command)
+        File.write("#{dokken_kitchen_sandbox}/run_command", command)
       end
 
       def runner_container_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Sean OMeara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -75,7 +75,7 @@ homepage: https://github.com/someara/kitchen-dokken
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes
   to produce sparse container images