Skip to content

Commit

Permalink
Simplify Travis config and fix ChefDK 2.0 failures
Browse files Browse the repository at this point in the history
  • Loading branch information
tas50 committed Jun 28, 2017
1 parent 9ea6c05 commit 8254c14
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dist: trusty
addons:
apt:
sources:
- chef-stable-trusty
- chef-current-trusty
packages:
- chefdk

Expand All @@ -26,15 +26,15 @@ 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

0 comments on commit 8254c14

Please sign in to comment.