Merge pull request #6459 from chef/tests

Get the build green again

4 files changed, 63 insertions, 75 deletions

diff --git a/.travis.yml b/.travis.yml
index 83b00830f7..179d0e9d46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,52 +33,42 @@ env:
 
 matrix:
   include:
-  - rvm: 2.2.6
+  - rvm: 2.2.8
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.3.3
+    rvm: 2.3.5
     script: bundle exec rake style
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-  - env:
-      AUDIT_CHECK: 1
-    rvm: 2.3.3
-    script: bundle exec bundle-audit check --update
-    # also remove integration / external tests
-    bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   #
   # External tests
   #
   - env:
       TEST_GEM: chef-provisioning
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.3.3
+    rvm: 2.3.5
   - env:
       TEST_GEM: chef-sugar
     script: tasks/bin/run_external_test $TEST_GEM rake
-    rvm: 2.3.3
-  - env:
-      - TEST_GEM: chef-zero
-    script: tasks/bin/run_external_test $TEST_GEM rake spec cheffs
-    rvm: 2.3.3
+    rvm: 2.3.5
   - env:
       TEST_GEM: cheffish
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.3.3
+    rvm: 2.3.5
   - env:
       TEST_GEM: chefspec
     # The chefspec tests + bundler cache + "gem update --system" interact badly :/
@@ -88,26 +78,22 @@ matrix:
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
       - bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry
     script: tasks/bin/run_external_test $TEST_GEM rake
-    rvm: 2.3.3
+    rvm: 2.3.5
   - env:
       TEST_GEM: foodcritic
     script: tasks/bin/run_external_test $TEST_GEM rake test
-    rvm: 2.3.3
-  - env:
-      TEST_GEM: halite
-    script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.3.3
+    rvm: 2.3.5
   - env:
       TEST_GEM: knife-windows
     script: tasks/bin/run_external_test $TEST_GEM rake unit_spec
-    rvm: 2.3.3
+    rvm: 2.3.5
   - env:
       TEST_GEM: poise
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.3.3
+    rvm: 2.3.5
   ### START TEST KITCHEN ONLY ###
   #
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -125,7 +111,7 @@ matrix:
     env:
       - UBUNTU=14.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -143,7 +129,7 @@ matrix:
     env:
       - UBUNTU=16.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -161,7 +147,7 @@ matrix:
     env:
       - DEBIAN=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -179,7 +165,7 @@ matrix:
     env:
       - DEBIAN=8
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -197,7 +183,7 @@ matrix:
     env:
       - DEBIAN=9
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -215,7 +201,7 @@ matrix:
     env:
       - CENTOS=6
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -233,7 +219,7 @@ matrix:
     env:
       - CENTOS=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -251,7 +237,7 @@ matrix:
     env:
       - AWESOME_CUSTOMERS_UBUNTU=1
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -270,7 +256,7 @@ matrix:
       - AWESOME_CUSTOMERS_RHEL=1
       - KITCHEN_YAML=.kitchen.travis.yml
     ### END TEST KITCHEN ONLY ###
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     sudo: required
     dist: trusty
     before_install:
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 6d8f40436a..57415f852a 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -14,7 +14,7 @@ DEPENDENCIES
   php (~> 1.5.0)
   resolver
     git: https://github.com/chef-cookbooks/resolver.git
-    revision: 8bf9034dabc47d29a07870e4059c32114f2c820a
+    revision: 943e7369cfabc6409ca4a213a9a54c06a807b302
 
 GRAPH
   apt (4.0.2)
@@ -52,37 +52,37 @@ GRAPH
     sudo (>= 0.0.0)
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
-  build-essential (7.0.3)
-    compat_resource (>= 12.16.3)
+  build-essential (8.0.3)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (7.1.0)
-    cron (>= 1.7.0)
+  chef-client (8.1.8)
+    cron (>= 2.0.0)
     logrotate (>= 1.9.0)
-    windows (>= 1.42.0)
+    windows (>= 2.0.0)
   chef-sugar (3.4.0)
-  chef_hostname (0.4.2)
+  chef_hostname (0.6.1)
+  compat_resource (12.19.0)
+  cron (4.1.3)
     compat_resource (>= 0.0.0)
-  compat_resource (12.16.3)
-  cron (3.0.0)
   database (6.1.1)
     postgresql (>= 1.0.0)
-  firewall (2.5.3)
+  firewall (2.6.2)
     chef-sugar (>= 0.0.0)
-  httpd (0.4.4)
-    compat_resource (>= 12.14.6)
-  iis (5.0.5)
-    windows (>= 1.34.6)
-  iptables (3.1.0)
-    compat_resource (>= 12.14.3)
-  logrotate (2.1.0)
-    compat_resource (>= 0.0.0)
-  mariadb (1.0.1)
+  httpd (0.5.0)
+  iis (6.7.3)
+    windows (>= 2.0)
+  inifile_chef_gem (0.1.0)
+    build-essential (>= 0.0.0)
+  iptables (4.2.1)
+  logrotate (2.2.0)
+  mariadb (1.5.1)
     apt (>= 0.0.0)
+    build-essential (>= 0.0.0)
+    selinux_policy (~> 2.0)
     yum (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  mingw (1.2.5)
-    compat_resource (>= 12.16.3)
+    yum-scl (>= 0.0.0)
+  mingw (2.0.1)
     seven_zip (>= 0.0.0)
   multipackage (4.0.0)
     compat_resource (>= 0.0.0)
@@ -93,14 +93,12 @@ GRAPH
     build-essential (>= 0.0.0)
     mariadb (>= 0.0.0)
     mysql (>= 6.0)
-  nscd (4.1.0)
-    compat_resource (>= 0.0.0)
-  ntp (3.3.1)
-  ohai (4.2.3)
-    compat_resource (>= 12.14.7)
-  openssh (2.1.1)
+  nscd (5.0.0)
+  ntp (3.5.2)
+  ohai (5.2.0)
+  openssh (2.5.0)
     iptables (>= 1.0)
-  openssl (6.1.1)
+  openssl (7.1.0)
   php (1.5.0)
     build-essential (>= 0.0.0)
     iis (>= 0.0.0)
@@ -108,27 +106,32 @@ GRAPH
     windows (>= 0.0.0)
     xml (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  postgresql (6.0.1)
+  postgresql (6.1.1)
     build-essential (>= 2.0.0)
     compat_resource (>= 12.16.3)
     openssl (>= 4.0)
   rbac (1.0.3)
-  resolver (1.3.1)
+  resolver (2.0.1)
   selinux (0.9.0)
+  selinux_policy (2.0.1)
+    compat_resource (>= 12.16.3)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
   smf (2.2.8)
     rbac (>= 1.0.1)
-  sudo (3.3.1)
-  ubuntu (2.0.0)
+  sudo (3.5.3)
+  ubuntu (2.0.1)
     apt (>= 0.0.0)
-  users (4.0.3)
-  windows (2.1.1)
+  users (5.1.0)
+  windows (3.1.3)
     ohai (>= 4.0.0)
-  xml (3.1.1)
+  xml (3.1.2)
     build-essential (>= 0.0.0)
-  yum (4.1.0)
-  yum-epel (2.1.1)
+  yum (5.0.1)
+  yum-epel (2.1.2)
     compat_resource (>= 12.16.3)
-  yum-mysql-community (2.0.3)
+  yum-mysql-community (2.1.0)
     compat_resource (>= 12.16.3)
+  yum-scl (0.2.0)
+    inifile_chef_gem (>= 0.0.0)
+    yum (>= 0.0.0)
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index e41d2ff808..707a38a7f6 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-gem "chef-config", "< 13"
 gem "rake" # required to build some native extensions
 gem "berkshelf"
 gem "kitchen-appbundle-updater"
diff --git a/kitchen-tests/test/fixtures/serverspec_helper.rb b/kitchen-tests/test/fixtures/serverspec_helper.rb
index a56e00b49e..ebde693323 100644
--- a/kitchen-tests/test/fixtures/serverspec_helper.rb
+++ b/kitchen-tests/test/fixtures/serverspec_helper.rb
@@ -1,3 +1,3 @@
 require "serverspec"
 
-set :backend, :exec
\ No newline at end of file
+set :backend, :exec