diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml index 6d0f47d..1f9b470 100644 --- a/.kitchen.dokken.yml +++ b/.kitchen.dokken.yml @@ -13,9 +13,6 @@ provisioner: name: dokken platforms: -- name: ubuntu-14-04 - driver: - image: ubuntu:14.04 - name: ubuntu-16-04 driver: image: ubuntu:16.04 diff --git a/.travis.yml b/.travis.yml index 173df49..42f1794 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,23 +13,18 @@ before_install: - gem update --system # see https://github.com/bundler/bundler/issues/5357 env: - - INSTANCE=ubuntu-14-04 - - INSTANCE=ubuntu-14-04 CHEF_VERSION=12.5.1 - - INSTANCE=ubuntu-16-04 - - INSTANCE=ubuntu-16-04 CHEF_VERSION=12.5.1 - - INSTANCE=centos-6 - - INSTANCE=centos-6 CHEF_VERSION=12.5.1 - - INSTANCE=centos-7 - - INSTANCE=centos-7 CHEF_VERSION=12.5.1 + - INSTANCE=ubuntu-16-04 + - INSTANCE=ubuntu-16-04 CHEF_VERSION=12.5.1 + - INSTANCE=centos-6 + - INSTANCE=centos-6 CHEF_VERSION=12.5.1 + - INSTANCE=centos-7 + - INSTANCE=centos-7 CHEF_VERSION=12.5.1 script: - - KITCHEN_LOCAL_YAML=.kitchen.dokken.yml bundle exec rake kitchen + - KITCHEN_LOCAL_YAML=.kitchen.dokken.yml bundle exec rake kitchen matrix: fast_finish: true - allow_failures: - - env: INSTANCE=ubuntu-14-04 - - env: INSTANCE=ubuntu-14-04 CHEF_VERSION=12.5.1 include: - env: UNIT_AND_LINT=1 script: