summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-03-20 09:51:15 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2017-03-20 09:51:15 -0700
commitafaed73f2d737caa76cc2f3f6f218e9418263323 (patch)
treec51baad627c737013a8f8d412071890b44c09ad6 /.travis.yml
parent1380fcdb59d3425b2322aa9e62dd42c8bf36cb0a (diff)
downloadchef-afaed73f2d737caa76cc2f3f6f218e9418263323.tar.gz
re-enable amazon linux tests we had to disable
these work now. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml37
1 files changed, 18 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index 1462a68e4b..3afe4670c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -253,25 +253,24 @@ matrix:
# env:
# - FEDORA=latest
# - KITCHEN_YAML=.kitchen.travis.yml
-# can re-enable amazonlinux when we get a build in current that contains the crypto libs added in #5687
-# - rvm: 2.3.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)
-# 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.3.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)
+ 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.3.3
# services: docker
# sudo: required