summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Preston <stuart@chef.io>2018-07-09 09:47:01 +0100
committerGitHub <noreply@github.com>2018-07-09 09:47:01 +0100
commit9521e5b0d40f85dd747c28f6fa6f2ebaf14406e9 (patch)
tree3101b10e5acfdfccf6470bdf243e5260590ff76e
parent32e02d9f7a05c5f2d734606a5185666443306e22 (diff)
parentf76bce015d8b4a6721311f7a12d19e9b050b60cb (diff)
downloadchef-9521e5b0d40f85dd747c28f6fa6f2ebaf14406e9.tar.gz
Merge pull request #7430 from chef/sp/disable-amazon-linux-2
chef-13: Temporarily disable testing on Amazon Linux 2 in Travis
-rw-r--r--.travis.yml36
1 files changed, 19 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 969f35c8b9..c4f1ba3911 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -125,23 +125,25 @@ matrix:
rvm: 2.4.3
### START TEST KITCHEN ONLY ###
#
- - rvm: 2.4.3
- 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 base-amazonlinux
- after_failure:
- - cat .kitchen/logs/kitchen.log
- env:
- - AMAZON=LATEST
- - KITCHEN_YAML=.kitchen.travis.yml
+ # Temporarily Disable Amazon Linux 2
+ #
+ # - rvm: 2.4.3
+ # 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 base-amazonlinux
+ # after_failure:
+ # - cat .kitchen/logs/kitchen.log
+ # env:
+ # - AMAZON=LATEST
+ # - KITCHEN_YAML=.kitchen.travis.yml
- rvm: 2.4.3
services: docker
sudo: required