diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-20 11:27:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 11:27:13 -0700 |
| commit | d039f336b6c364df13f5a3fb74a493649e93c64c (patch) | |
| tree | c1fd7825f0185e95ba6209d2a756ebbf6358c9ef | |
| parent | 5d74e230bce0aff28ce2f8b7724efaf141a9f873 (diff) | |
| parent | afaed73f2d737caa76cc2f3f6f218e9418263323 (diff) | |
| download | chef-d039f336b6c364df13f5a3fb74a493649e93c64c.tar.gz | |
Merge pull request #5918 from chef/lcg/reenable-amazon-tests
reenable the amazon linux tests we had to disable
| -rw-r--r-- | .travis.yml | 37 |
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 |