summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-07-03 14:50:02 -0700
committerGitHub <noreply@github.com>2018-07-03 14:50:02 -0700
commit37517d1c380d9d4cbc9d8bd2803da521be89184e (patch)
tree84e246e1bda8dae5bd36e381793aeb27a0dce29b
parentff44b1591e816c3fa70556a01d60dc707fbf45a5 (diff)
parent6838530601af6309be5568636760691b755ecd04 (diff)
downloadchef-37517d1c380d9d4cbc9d8bd2803da521be89184e.tar.gz
Merge pull request #7418 from chef/sp/temp-disable-amazon-linux-2
Temporary disable of Amazon Linux 2 from Travis CI
-rw-r--r--.travis.yml36
1 files changed, 19 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 40b2e7ddef..3f9bede22d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -116,23 +116,25 @@ matrix:
# rvm: 2.5.1
### START TEST KITCHEN ONLY ###
#
- - 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
+ # 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