Simplify Travis config and fix ChefDK 2.0 failures

This commit is contained in:
Tim Smith 2017-06-28 12:07:42 -07:00
parent 9ea6c05ce5
commit 8254c14603

View File

@ -4,7 +4,7 @@ dist: trusty
addons: addons:
apt: apt:
sources: sources:
- chef-stable-trusty - chef-current-trusty
packages: packages:
- chefdk - chefdk
@ -26,15 +26,15 @@ env:
before_script: before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(/opt/chefdk/bin/chef shell-init bash)" - eval "$(chef shell-init bash)"
- /opt/chefdk/embedded/bin/chef --version - chef --version
- /opt/chefdk/embedded/bin/cookstyle --version - cookstyle --version
- /opt/chefdk/embedded/bin/foodcritic --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: matrix:
include: include:
- script: - script:
- /opt/chefdk/bin/chef exec delivery local all - chef exec delivery local all
env: UNIT_AND_LINT=1 env: UNIT_AND_LINT=1