summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-07-09 16:41:02 -0700
committerTim Smith <tsmith@chef.io>2018-07-09 16:41:02 -0700
commitc6726cf0617324932414faf8e536bf018580b3f2 (patch)
tree528f110efd8045df532d9e0e79828a5d9db0327b /.travis.yml
parenta2114c8b63cdace864f8b67f0090e30de2ed009f (diff)
downloadchef-c6726cf0617324932414faf8e536bf018580b3f2.tar.gz
Enable Amazon Linux 2.0 tests again
We've deployed a new omnitruck release which should correct the version identification bug we had before. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml38
1 files changed, 17 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml
index 3f9bede22d..fa25b9c38b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ branches:
only:
- master
- chef-13
- - chef-12
env:
global:
@@ -115,26 +114,23 @@ matrix:
# script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
# rvm: 2.5.1
### START TEST KITCHEN ONLY ###
- #
- # Amazon Linux 2 disabled pending fixes in omnitruck/mixlib-install
- #
- # - rvm: 2.4.4
- # services: docker
- # sudo: required
- # gemfile: kitchen-tests/Gemfile
- # before_install:
- # - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- # - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
- # before_script:
- # - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- # - cd kitchen-tests
- # script:
- # - bundle exec kitchen test end-to-end-amazonlinux-2
- # after_failure:
- # - cat .kitchen/logs/kitchen.log
- # env:
- # - AMAZON=2
- # - KITCHEN_YAML=kitchen.travis.yml
+ - rvm: 2.4.4
+ services: docker
+ sudo: required
+ gemfile: kitchen-tests/Gemfile
+ before_install:
+ - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+ - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
+ before_script:
+ - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+ - cd kitchen-tests
+ script:
+ - bundle exec kitchen test end-to-end-amazonlinux-2
+ after_failure:
+ - cat .kitchen/logs/kitchen.log
+ env:
+ - AMAZON=2
+ - KITCHEN_YAML=kitchen.travis.yml
- rvm: 2.4.4
services: docker
sudo: required