Remove testing of audit, halite, and chef-zero and test on latest rubies

Remove the failing tests so we start actually looking at the others.

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 22 insertions, 37 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/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