Skip to content

Commit

Permalink
Merge pull request #393 from legal90/fix-travis
Browse files Browse the repository at this point in the history
Avoid double testing in Travis
  • Loading branch information
legal90 authored Jan 12, 2017
2 parents 23b8f41 + 855c980 commit 63e0c71
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 17 deletions.
8 changes: 0 additions & 8 deletions .kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,6 @@ suites:
server: true
datacenter: FortMeade
encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
- name: archive
provisioner:
policyfile: test/fixtures/policies/default.rb
attributes:
consul:
provider: binary
options:
version: 0.7.1
- name: webui
provisioner:
policyfile: test/fixtures/policies/default.rb
Expand Down
13 changes: 4 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ env:
- INSTANCE=default-ubuntu-1204
- INSTANCE=default-debian-8
- INSTANCE=default-debian-7
- INSTANCE=archive-centos-7
- INSTANCE=archive-centos-6
- INSTANCE=archive-ubuntu-1604
- INSTANCE=archive-ubuntu-1404

before_script:
# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
- 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

script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen verify ${INSTANCE}

Expand All @@ -41,11 +41,6 @@ after_script:

matrix:
include:
- before_script:
- 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
- script:
- bundle install
- bundle exec rake
Expand Down

0 comments on commit 63e0c71

Please sign in to comment.