summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-04-03 15:01:01 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2017-04-03 15:01:01 -0700
commit1bd816fcb422c18864c483b3701653167f30bd70 (patch)
treeb68dd4203fab639be6ad5d7579517932aaf593c1
parentc3621ac82d131518166bb9d85183b9c51265d7b6 (diff)
downloadchef-1bd816fcb422c18864c483b3701653167f30bd70.tar.gz
add back amazon and allow failures
this will probably help with debugging it seems like a bit of a mess Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--.travis.yml55
1 files changed, 37 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index eec82d6a42..aea79db190 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -248,24 +248,24 @@ matrix:
# env:
# - FEDORA=latest
# - KITCHEN_YAML=.kitchen.travis.yml
-# - rvm: 2.4.1
-# 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)
-# bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-# before_script:
-# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-# - cd kitchen-tests
-# script:
-# - travis_wait bundle exec kitchen test webapp-amazonlinux
-# after_failure:
-# - cat .kitchen/logs/kitchen.log
-# env:
-# - AMAZONLINUX=LATEST
-# - KITCHEN_YAML=.kitchen.travis.yml
+ - rvm: 2.4.1
+ 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)
+ bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ before_script:
+ - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+ - cd kitchen-tests
+ script:
+ - travis_wait bundle exec kitchen test webapp-amazonlinux
+ after_failure:
+ - cat .kitchen/logs/kitchen.log
+ env:
+ - AMAZONLINUX=LATEST
+ - KITCHEN_YAML=.kitchen.travis.yml
# - rvm: 2.4.1
# services: docker
# sudo: required
@@ -323,6 +323,25 @@ matrix:
- cat /tmp/out.txt
- sudo cat /var/log/squid3/cache.log
- sudo cat /var/log/squid3/access.log
+ allow_failures:
+ - rvm: 2.4.1
+ 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)
+ bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ before_script:
+ - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+ - cd kitchen-tests
+ script:
+ - travis_wait bundle exec kitchen test webapp-amazonlinux
+ after_failure:
+ - cat .kitchen/logs/kitchen.log
+ env:
+ - AMAZONLINUX=LATEST
+ - KITCHEN_YAML=.kitchen.travis.yml
notifications:
on_change: true