diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml index 998b3096..4f9955d5 100644 --- a/.kitchen.dokken.yml +++ b/.kitchen.dokken.yml @@ -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 diff --git a/.travis.yml b/.travis.yml index 46ad95a5..663eff8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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} @@ -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