Simplify Travis config and fix ChefDK 2.0 failures

a2d68493 · Tim Smith · aa27b6c4 · a2d68493
Commit a2d68493 authored Jun 28, 2017 by Tim Smith
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

.travis.yml .travis.yml +7 -7

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: trusty
 addons:
  apt:
    sources:
-      - chef-stable-trusty
+      - chef-current-trusty
    packages:
      - chefdk

@@ -54,17 +54,17 @@ env:

 before_script:
  - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-  - eval "$(/opt/chefdk/bin/chef shell-init bash)"
-  - /opt/chefdk/embedded/bin/chef --version
-  - /opt/chefdk/embedded/bin/cookstyle --version
-  - /opt/chefdk/embedded/bin/foodcritic --version
+  - eval "$(chef shell-init bash)"
+  - chef --version
+  - cookstyle --version
+  - foodcritic --version

-script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
+script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen verify ${INSTANCE}

 matrix:
  include:
    - script:
-      - /opt/chefdk/bin/chef exec delivery local all
+      - chef exec delivery local all
      env: 
        - UNIT_AND_LINT=1
        - CHEF_FIPS=''