Merge pull request #6709 from chef/integration_docs

Remove lock files and test github masters in Kitchen Tests

6 files changed, 9 insertions, 493 deletions

diff --git a/.gitignore b/.gitignore
index 3a32f47541..35aecf92cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,10 @@ doc/
 Vagrantfile
 .vagrant/
 
-# Kitchen Tests Local Mode Data
+# Kitchen Tests lock files and chef data
 kitchen-tests/nodes/*
+kitchen-tests/Gemfile.lock
+kitchen-tests/Berksfile.lock
 
 # Temporary files present during spec runs
 spec/data/test-dir
diff --git a/.travis.yml b/.travis.yml
index fd8f8d33f6..ab0411e4b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -132,7 +132,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -150,7 +149,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -168,7 +166,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -186,7 +183,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -204,7 +200,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -222,7 +217,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -240,7 +234,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -258,7 +251,6 @@ matrix:
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
@@ -276,7 +268,6 @@ matrix:
     before_install:
      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
      - cd kitchen-tests
@@ -294,7 +285,6 @@ matrix:
     before_install:
      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     before_script:
      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
      - cd kitchen-tests
@@ -312,7 +302,6 @@ matrix:
 #    before_install:
 #      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
 #      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-#    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
 #    before_script:
 #      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
 #      - cd kitchen-tests
@@ -330,7 +319,6 @@ matrix:
 #    before_install:
 #      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
 #      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-#    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
 #    before_script:
 #      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
 #      - cd kitchen-tests
@@ -349,7 +337,6 @@ matrix:
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
       - sudo apt-get update
       - sudo apt-get -y install squid3 git curl
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
     env:
       - PROXY_TESTS_DIR=proxy_tests/files/default/scripts
       - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
deleted file mode 100644
index 815567bc1a..0000000000
--- a/kitchen-tests/Berksfile.lock
+++ /dev/null
@@ -1,62 +0,0 @@
-DEPENDENCIES
-  base
-    path: cookbooks/base
-
-GRAPH
-  apt (6.1.4)
-  base (0.1.0)
-    apt (>= 0.0.0)
-    build-essential (>= 0.0.0)
-    chef-apt-docker (>= 0.0.0)
-    chef-client (>= 0.0.0)
-    chef-yum-docker (>= 0.0.0)
-    chef_hostname (>= 0.0.0)
-    cron (>= 0.0.0)
-    git (>= 0.0.0)
-    logrotate (>= 0.0.0)
-    multipackage (>= 0.0.0)
-    nscd (>= 0.0.0)
-    ntp (>= 0.0.0)
-    openssh (>= 0.0.0)
-    resolver (>= 0.0.0)
-    selinux (>= 0.0.0)
-    sudo (>= 0.0.0)
-    ubuntu (>= 0.0.0)
-    users (>= 0.0.0)
-  build-essential (8.0.4)
-    mingw (>= 1.1)
-    seven_zip (>= 0.0.0)
-  chef-apt-docker (2.0.4)
-  chef-client (9.0.2)
-    cron (>= 4.2.0)
-    logrotate (>= 1.9.0)
-    windows (>= 2.0.0)
-  chef-yum-docker (3.1.0)
-  chef_hostname (0.6.1)
-  compat_resource (12.19.0)
-  cron (5.0.1)
-  git (8.0.0)
-    build-essential (>= 0.0.0)
-    homebrew (>= 0.0.0)
-  homebrew (4.2.0)
-  iptables (4.3.1)
-  logrotate (2.2.0)
-  mingw (2.0.1)
-    seven_zip (>= 0.0.0)
-  multipackage (4.0.0)
-    compat_resource (>= 0.0.0)
-  nscd (5.0.0)
-  ntp (3.5.4)
-  ohai (5.2.0)
-  openssh (2.6.1)
-    iptables (>= 1.0)
-  resolver (2.0.1)
-  selinux (2.1.0)
-  seven_zip (2.0.2)
-    windows (>= 1.2.2)
-  sudo (4.0.0)
-  ubuntu (2.0.1)
-    apt (>= 0.0.0)
-  users (5.3.0)
-  windows (3.4.1)
-    ohai (>= 4.0.0)
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index e41d2ff808..144363b4ae 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -1,13 +1,10 @@
 source "https://rubygems.org"
 
-gem "chef-config", "< 13"
 gem "rake" # required to build some native extensions
-gem "berkshelf"
-gem "kitchen-appbundle-updater"
+gem "chef", path: ".."
+gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
+gem "kitchen-appbundle-updater", git: "https://github.com/chef/kitchen-appbundle-updater", branch: "master"
 gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787
-gem "kitchen-ec2"
-gem "kitchen-inspec"
-gem "kitchen-vagrant"
-gem "ridley"
-gem "test-kitchen"
-gem "vagrant-wrapper"
+gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
+gem "kitchen-vagrant", git: "https://github.com/test-kitchen/kitchen-vagrant.git", branch: "master"
+gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master"
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
deleted file mode 100644
index 3dfae20dd8..0000000000
--- a/kitchen-tests/Gemfile.lock
+++ /dev/null
@@ -1,403 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    aws-sdk (2.10.94)
-      aws-sdk-resources (= 2.10.94)
-    aws-sdk-core (2.10.94)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.10.94)
-      aws-sdk-core (= 2.10.94)
-    aws-sigv4 (1.0.2)
-    berkshelf (6.3.1)
-      buff-config (~> 2.0)
-      buff-extensions (~> 2.0)
-      chef (>= 12.7.2)
-      cleanroom (~> 1.0)
-      concurrent-ruby (~> 1.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      minitar (~> 0.5, >= 0.5.4)
-      mixlib-archive (~> 0.4)
-      mixlib-shellout (~> 2.0)
-      octokit (~> 4.0)
-      retryable (~> 2.0)
-      ridley (~> 5.0)
-      solve (~> 4.0)
-      thor (~> 0.19, < 0.19.2)
-    buff-config (2.0.0)
-      buff-extensions (~> 2.0)
-      varia_model (~> 0.6)
-    buff-extensions (2.0.0)
-    buff-ignore (1.2.0)
-    buff-ruby_engine (1.0.0)
-    buff-shell_out (1.1.0)
-      buff-ruby_engine (~> 1.0)
-    builder (3.2.3)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    celluloid-io (0.16.2)
-      celluloid (>= 0.16.0)
-      nio4r (>= 1.1.0)
-    chef (12.21.26)
-      addressable
-      bundler (>= 1.10)
-      chef-config (= 12.21.26)
-      chef-zero (>= 4.8, < 13)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
-      iniparse (~> 1.4)
-      mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 2.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (>= 8.6.0.alpha.1, < 13)
-      plist (~> 3.2)
-      proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
-      syslog-logger (~> 1.6)
-      uuidtools (~> 2.1.5)
-    chef (12.21.26-universal-mingw32)
-      addressable
-      bundler (>= 1.10)
-      chef-config (= 12.21.26)
-      chef-zero (>= 4.8, < 13)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
-      iniparse (~> 1.4)
-      mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 2.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (>= 8.6.0.alpha.1, < 13)
-      plist (~> 3.2)
-      proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
-      syslog-logger (~> 1.6)
-      uuidtools (~> 2.1.5)
-      win32-api (~> 1.5.3)
-      win32-dir (~> 0.5.0)
-      win32-event (~> 0.6.1)
-      win32-eventlog (= 0.6.3)
-      win32-mmap (~> 0.4.1)
-      win32-mutex (~> 0.4.2)
-      win32-process (~> 0.8.2)
-      win32-service (~> 0.8.7)
-      windows-api (~> 0.4.4)
-      wmi-lite (~> 1.0)
-    chef-config (12.21.26)
-      addressable
-      fuzzyurl
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
-    chef-zero (5.3.2)
-      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 1.3)
-      rack (~> 2.0)
-      uuidtools (~> 2.1)
-    cleanroom (1.0.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    docker-api (1.34.0)
-      excon (>= 0.47.0)
-      multi_json
-    erubis (2.7.0)
-    excon (0.59.0)
-    faraday (0.13.1)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
-    ffi (1.9.18-x86-mingw32)
-    ffi-win32-extensions (1.0.3)
-      ffi
-    ffi-yajl (2.3.1)
-      libyajl2 (~> 1.2)
-    fuzzyurl (0.9.0)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashie (3.5.6)
-    highline (1.7.10)
-    hitimes (1.2.6)
-    hitimes (1.2.6-x86-mingw32)
-    htmlentities (4.3.4)
-    httpclient (2.8.3)
-    iniparse (1.4.4)
-    inspec (1.46.2)
-      addressable (~> 2.4)
-      faraday (>= 0.9.0)
-      hashie (~> 3.4)
-      htmlentities
-      json (>= 1.8, < 3.0)
-      method_source (~> 0.8)
-      mixlib-log
-      parallel (~> 1.9)
-      parslet (~> 1.5)
-      pry (~> 0)
-      rainbow (~> 2)
-      rspec (~> 3)
-      rspec-its (~> 1.2)
-      rubyzip (~> 1.1)
-      semverse
-      sslshake (~> 1.2)
-      thor (~> 0.19)
-      tomlrb (~> 1.2)
-      train (~> 0.29, >= 0.29.2)
-    ipaddress (0.8.3)
-    jmespath (1.3.1)
-    json (2.1.0)
-    kitchen-appbundle-updater (0.2.0)
-    kitchen-dokken (1.1.0)
-      docker-api (~> 1.33)
-      test-kitchen (~> 1.13)
-    kitchen-ec2 (1.4.0)
-      aws-sdk (~> 2)
-      excon
-      multi_json
-      retryable (~> 2.0)
-      test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.20.0)
-      hashie (~> 3.4)
-      inspec (>= 0.34.0, < 2.0.0)
-      test-kitchen (~> 1.6)
-    kitchen-vagrant (1.2.1)
-      test-kitchen (~> 1.4)
-    libyajl2 (1.2.0)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    method_source (0.9.0)
-    minitar (0.6.1)
-    mixlib-archive (0.4.1)
-      mixlib-log
-    mixlib-authentication (1.4.2)
-    mixlib-cli (1.7.0)
-    mixlib-config (2.2.4)
-    mixlib-install (3.8.0)
-      mixlib-shellout
-      mixlib-versioning
-      thor
-    mixlib-log (1.7.1)
-    mixlib-shellout (2.3.2)
-    mixlib-shellout (2.3.2-universal-mingw32)
-      win32-process (~> 0.8.2)
-      wmi-lite (~> 1.0)
-    mixlib-versioning (1.2.2)
-    molinillo (0.6.4)
-    multi_json (1.12.2)
-    multipart-post (2.0.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.1)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
-    nio4r (2.1.0)
-    nori (2.6.0)
-    octokit (4.7.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.25.1)
-      chef-config (>= 12.5.0.alpha.1, < 14)
-      ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
-      ipaddress
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log (>= 1.7.1, < 2.0)
-      mixlib-shellout (~> 2.0)
-      plist (~> 3.1)
-      systemu (~> 2.6.4)
-      wmi-lite (~> 1.0)
-    parallel (1.12.0)
-    parslet (1.8.1)
-    plist (3.3.0)
-    proxifier (1.0.3)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.1)
-    rack (2.0.3)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.0)
-    retryable (2.0.4)
-    ridley (5.1.1)
-      addressable
-      buff-config (~> 2.0)
-      buff-extensions (~> 2.0)
-      buff-ignore (~> 1.2)
-      buff-shell_out (~> 1.0)
-      celluloid (~> 0.16.0)
-      celluloid-io (~> 0.16.1)
-      chef-config (>= 12.5.0)
-      erubis
-      faraday (~> 0.9)
-      hashie (>= 2.0.2, < 4.0.0)
-      httpclient (~> 2.7)
-      json (>= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      retryable (~> 2.0)
-      semverse (~> 2.0)
-      varia_model (~> 0.6)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubyntlm (0.6.2)
-    rubyzip (1.2.1)
-    safe_yaml (1.0.4)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    semverse (2.0.0)
-    serverspec (2.41.3)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.72)
-    sfl (2.3)
-    solve (4.0.0)
-      molinillo (~> 0.6)
-      semverse (>= 1.1, < 3.0)
-    specinfra (2.72.1)
-      net-scp
-      net-ssh (>= 2.7, < 5.0)
-      net-telnet
-      sfl
-    sslshake (1.2.0)
-    syslog-logger (1.6.8)
-    systemu (2.6.5)
-    test-kitchen (1.19.2)
-      mixlib-install (~> 3.6)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
-      thor (~> 0.19, < 0.19.2)
-      winrm (~> 2.0)
-      winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.1.0)
-    thor (0.19.1)
-    timers (4.0.4)
-      hitimes
-    tomlrb (1.2.6)
-    train (0.29.2)
-      docker-api (~> 1.26)
-      json (>= 1.8, < 3.0)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 5.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    uuidtools (2.1.5)
-    vagrant-wrapper (2.0.3)
-    varia_model (0.6.0)
-      buff-extensions (~> 2.0)
-      hashie (>= 2.0.2, < 4.0.0)
-    win32-api (1.5.3-universal-mingw32)
-    win32-dir (0.5.1)
-      ffi (>= 1.0.0)
-    win32-event (0.6.3)
-      win32-ipc (>= 0.6.0)
-    win32-eventlog (0.6.3)
-      ffi
-    win32-ipc (0.7.0)
-      ffi
-    win32-mmap (0.4.2)
-      ffi
-    win32-mutex (0.4.3)
-      win32-ipc (>= 0.6.0)
-    win32-process (0.8.3)
-      ffi (>= 1.0.0)
-    win32-service (0.8.10)
-      ffi
-      ffi-win32-extensions
-    windows-api (0.4.4)
-      win32-api (>= 1.4.5)
-    winrm (2.2.3)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.1.1)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm (~> 2.0)
-    wmi-lite (1.0.0)
-
-PLATFORMS
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  berkshelf
-  chef-config (< 13)
-  kitchen-appbundle-updater
-  kitchen-dokken (< 2.0)
-  kitchen-ec2
-  kitchen-inspec
-  kitchen-vagrant
-  rake
-  ridley
-  test-kitchen
-  vagrant-wrapper
-
-BUNDLED WITH
-   1.16.0
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index 1c4ec14911..1dba2b4190 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -39,8 +39,6 @@ namespace :dependencies do
                     dependencies:update_gemfile_lock
                     dependencies:update_omnibus_gemfile_lock
                     dependencies:update_acceptance_gemfile_lock
-                    dependencies:update_kitchen_tests_gemfile_lock
-                    dependencies:update_kitchen_tests_berksfile_lock
                     dependencies:update_audit_tests_berksfile_lock
                   }
 
@@ -84,9 +82,6 @@ namespace :dependencies do
   bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
   bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
   bundle_update_task :update_acceptance_gemfile_lock, "acceptance"
-  bundle_update_locked_multiplatform_task :update_kitchen_tests_gemfile_lock, "kitchen-tests"
-
-  berks_update_task :update_kitchen_tests_berksfile_lock, "kitchen-tests"
   berks_update_task :update_audit_tests_berksfile_lock, "kitchen-tests/cookbooks/audit_test"
 
 end