summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-20 07:57:43 -0700
committerGitHub <noreply@github.com>2018-03-20 07:57:43 -0700
commitf024dc6865b790fdaf168310005b425dbbdcb84b (patch)
tree4b447a518f7b5df43d0334e2bad48b71d9d2a392 /.travis.yml
parent5cd74953c899095f0d63fe3d0941a64654aba84e (diff)
parent00d33cac95db5ca34caf7dcdb105f392fa57a858 (diff)
downloadchef-f024dc6865b790fdaf168310005b425dbbdcb84b.tar.gz
Merge pull request #7004 from chef/amazon_linux_build_essential
Don't try to install old GCC packages on Amazon Linux 2
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml19
1 files changed, 18 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index fd2b2b9d3b..b053cd519e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,11 +133,28 @@ matrix:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
script:
+ - bundle exec kitchen test base-amazonlinux-2
+ after_failure:
+ - cat .kitchen/logs/kitchen.log
+ env:
+ - AMAZON=2
+ - KITCHEN_YAML=.kitchen.travis.yml
+ - 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
+ - AMAZON=201X
- KITCHEN_YAML=.kitchen.travis.yml
- rvm: 2.4.3
services: docker