Merge pull request #5062 from chef/ksubrama/test1ksubrama/test

foo

6 files changed, 78 insertions, 75 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index dffeaba17b..23127e211d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,12 +99,12 @@ GEM
       mixlib-cli (~> 1.4)
     artifactory (2.3.2)
     ast (2.3.0)
-    aws-sdk (2.3.14)
-      aws-sdk-resources (= 2.3.14)
-    aws-sdk-core (2.3.14)
+    aws-sdk (2.3.16)
+      aws-sdk-resources (= 2.3.16)
+    aws-sdk-core (2.3.16)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.14)
-      aws-sdk-core (= 2.3.14)
+    aws-sdk-resources (2.3.16)
+      aws-sdk-core (= 2.3.16)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -173,7 +173,7 @@ GEM
       yajl-ruby (~> 1.1)
     fuzzyurl (0.8.0)
     gherkin (4.0.0)
-    github_api (0.14.0)
+    github_api (0.14.1)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
@@ -237,7 +237,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
+    net-ssh (3.2.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -260,7 +260,7 @@ GEM
       rack (>= 1.2, < 3)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.16.0)
+    ohai (8.17.0)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -344,7 +344,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.59.0)
+    specinfra (2.59.3)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -356,11 +356,11 @@ GEM
     systemu (2.6.5)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tomlrb (1.2.1)
+    tomlrb (1.2.2)
     treetop (1.6.5)
       polyglot (~> 0.3)
     ubuntu_ami (0.4.1)
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)
     uuidtools (2.1.5)
     win32-api (1.5.3-universal-mingw32)
     win32-dir (0.5.1)
@@ -369,7 +369,7 @@ GEM
       win32-ipc (>= 0.6.0)
     win32-eventlog (0.6.3)
       ffi
-    win32-ipc (0.6.6)
+    win32-ipc (0.7.0)
       ffi
     win32-mmap (0.4.2)
       ffi
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 6abf73932f..26a4541ca9 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.2)
-    aws-sdk (2.3.14)
-      aws-sdk-resources (= 2.3.14)
-    aws-sdk-core (2.3.14)
+    aws-sdk (2.3.16)
+      aws-sdk-resources (= 2.3.16)
+    aws-sdk-core (2.3.16)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.14)
-      aws-sdk-core (= 2.3.14)
+    aws-sdk-resources (2.3.16)
+      aws-sdk-core (= 2.3.16)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -60,7 +60,7 @@ GEM
     cleanroom (1.0.0)
     coderay (1.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.28.0)
+    docker-api (1.29.0)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
@@ -124,7 +124,7 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
+    net-ssh (3.2.0)
     nio4r (1.2.1)
     nori (2.6.0)
     octokit (4.3.0)
@@ -180,7 +180,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.9.2)
+    test-kitchen (1.10.2)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -211,7 +211,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0)
-    winrm-fs (0.4.2)
+    winrm-fs (0.4.3)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index d24f5d7bfe..79bb375d05 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -10,7 +10,8 @@ DEPENDENCIES
 
 GRAPH
   apache2 (3.2.2)
-  apt (3.0.0)
+  apt (4.0.1)
+    compat_resource (>= 12.10)
   aws (3.3.3)
     ohai (>= 2.1.0)
   base (0.1.0)
@@ -29,18 +30,19 @@ GRAPH
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  build-essential (4.0.0)
-    mingw (>= 0.0.0)
+  build-essential (6.0.0)
+    compat_resource (>= 12.10)
+    mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (4.5.2)
+  chef-client (4.6.0)
     cron (>= 1.7.0)
     logrotate (>= 1.9.0)
-    windows (>= 1.39.0)
+    windows (>= 1.42.0)
   chef-sugar (3.3.0)
   chef_handler (1.4.0)
   chef_hostname (0.4.1)
     compat_resource (>= 0.0.0)
-  compat_resource (12.10.4)
+  compat_resource (12.10.6)
   cron (1.7.6)
   database (2.3.1)
     aws (>= 0.0.0)
@@ -48,11 +50,11 @@ GRAPH
     mysql-chef_gem (~> 0.0)
     postgresql (>= 1.0.0)
     xfs (>= 0.0.0)
-  iis (4.1.7)
+  iis (4.1.8)
     windows (>= 1.34.6)
   iptables (2.2.0)
   logrotate (1.9.2)
-  mingw (1.0.0)
+  mingw (1.2.2)
     compat_resource (>= 0.0.0)
     seven_zip (>= 0.0.0)
   multipackage (3.0.28)
@@ -62,12 +64,12 @@ GRAPH
   mysql-chef_gem (0.0.5)
     build-essential (>= 0.0.0)
     mysql (>= 0.0.0)
-  nscd (4.0.0)
+  nscd (4.1.0)
     compat_resource (>= 0.0.0)
   ntp (2.0.0)
     windows (>= 1.38.0)
-  ohai (4.0.2)
-    compat_resource (>= 12.9.0)
+  ohai (4.1.1)
+    compat_resource (>= 12.10)
   openssh (2.0.0)
     iptables (>= 1.0)
   openssl (4.4.0)
@@ -96,13 +98,13 @@ GRAPH
     database (~> 2.3.1)
     mysql (~> 5.6.3)
     php (~> 1.5.0)
-  windows (1.41.0)
+  windows (1.44.0)
     chef_handler (>= 0.0.0)
   xfs (2.0.1)
   xml (2.0.0)
     build-essential (>= 0.0.0)
     chef-sugar (>= 0.0.0)
-  yum (3.10.0)
+  yum (3.11.0)
   yum-epel (0.7.0)
     yum (>= 3.6.3)
   yum-mysql-community (0.2.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 8ab7fbe707..b0cf434cc0 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,13 +3,13 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.2)
-    aws-sdk (2.3.9)
-      aws-sdk-resources (= 2.3.9)
-    aws-sdk-core (2.3.9)
+    aws-sdk (2.3.16)
+      aws-sdk-resources (= 2.3.16)
+    aws-sdk-core (2.3.16)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.9)
-      aws-sdk-core (= 2.3.9)
-    berkshelf (4.3.3)
+    aws-sdk-resources (2.3.16)
+      aws-sdk-core (= 2.3.16)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -21,6 +21,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -44,21 +45,21 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.10.24)
+    chef-config (12.11.18)
       fuzzyurl (~> 0.8.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.26.2)
+    docker-api (1.29.0)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
     excon (0.49.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.10-x86-mingw32)
     fuzzyurl (0.8.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -68,24 +69,24 @@ GEM
     hitimes (1.2.4)
     hitimes (1.2.4-x86-mingw32)
     httpclient (2.7.2)
-    inspec (0.22.1)
+    inspec (0.26.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
       pry (~> 0)
-      r-train (~> 0.12)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
+      train (~> 0.13)
     jmespath (1.2.4)
       json_pure (>= 1.8.1)
     json (1.8.3)
     json_pure (1.8.3)
     kitchen-appbundle-updater (0.1.2)
-    kitchen-dokken (0.0.29)
-      docker-api (~> 1.26.2)
+    kitchen-dokken (0.0.30)
+      docker-api (~> 1.28)
       test-kitchen (~> 1.5)
     kitchen-ec2 (1.0.0)
       aws-sdk (~> 2)
@@ -104,13 +105,11 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
-    mixlib-authentication (1.4.0)
+    mixlib-archive (0.1.0)
+    mixlib-authentication (1.4.1)
       mixlib-log
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.12)
+    mixlib-install (1.0.13)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -125,7 +124,7 @@ GEM
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
+    net-ssh (3.2.0)
     nio4r (1.2.1)
     nori (2.6.0)
     octokit (4.3.0)
@@ -134,14 +133,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    r-train (0.12.1)
-      docker-api (~> 1.26)
-      json (~> 1.8)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
-      winrm (~> 1.6)
-      winrm-fs (~> 0.3)
     rainbow (2.1.0)
     retryable (2.0.3)
     ridley (4.5.1)
@@ -189,7 +180,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.9.0)
+    test-kitchen (1.10.2)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -199,6 +190,14 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
+    train (0.13.1)
+      docker-api (~> 1.26)
+      json (~> 1.8)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 4.0)
+      winrm (~> 1.6)
+      winrm-fs (~> 0.3)
     vagrant-wrapper (2.0.3)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
@@ -213,7 +212,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0)
-    winrm-fs (0.4.2)
+    winrm-fs (0.4.3)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 39f5dbba9d..cf7cc6a3e8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: cb6f0afa1cd334f25aece7deeef3a9454cecc0e7
+  revision: 32324e19b76f75d06c6e3c7333a8865c9b5767c3
   specs:
     omnibus-software (4.0.0)
       omnibus (>= 5.2.0)
@@ -38,13 +38,13 @@ GEM
     addressable (2.4.0)
     artifactory (2.3.2)
     awesome_print (1.7.0)
-    aws-sdk (2.3.14)
-      aws-sdk-resources (= 2.3.14)
-    aws-sdk-core (2.3.14)
+    aws-sdk (2.3.16)
+      aws-sdk-resources (= 2.3.16)
+    aws-sdk-core (2.3.16)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.14)
-      aws-sdk-core (= 2.3.14)
-    berkshelf (4.3.3)
+    aws-sdk-resources (2.3.16)
+      aws-sdk-core (= 2.3.16)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -56,6 +56,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -121,11 +122,12 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
+    mixlib-archive (0.1.0)
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.6.0)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.12)
+    mixlib-install (1.0.13)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -140,7 +142,7 @@ GEM
     multipart-post (1.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
+    net-ssh (3.2.0)
     nio4r (1.2.1)
     nori (2.6.0)
     octokit (4.3.0)
@@ -201,7 +203,7 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.9.2)
+    test-kitchen (1.10.2)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -224,7 +226,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0)
-    winrm-fs (0.4.2)
+    winrm-fs (0.4.3)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 7771e805e3..b71a60a938 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,5 +1,5 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.4"
+override :rubygems, version: "2.6.6"
 override :bundler, version: "1.12.5"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.14"