diff options
author | Tim Smith <tsmith@chef.io> | 2018-10-29 12:06:34 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-29 12:06:34 -0700 |
commit | 4adf8e07a370adbf928402bbab51c1a5f65819f7 (patch) | |
tree | 636190697821ef69e8e365d84d15e886efb0095e | |
parent | a7a0a8f7a49e19ba78ac9e11c573e0bdd1101e8a (diff) | |
parent | 7a18dc9f6634e256b783de42699cda6b578cfc99 (diff) | |
download | chef-4adf8e07a370adbf928402bbab51c1a5f65819f7.tar.gz |
Merge pull request #7807 from chef/kitchen_testing
Add travis testing of Amazon Linux and Ubuntu 18.04
-rw-r--r-- | .travis.yml | 88 |
1 files changed, 34 insertions, 54 deletions
diff --git a/.travis.yml b/.travis.yml index cb3fc47d73..ee8369ec21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,26 +121,23 @@ matrix: script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec rvm: 2.4.5 ### START TEST KITCHEN ONLY ### - # - # Temporarily Disable Amazon Linux 2 - # - # - rvm: 2.4.5 - # 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 end-to-end-amazonlinux - # after_failure: - # - cat .kitchen/logs/kitchen.log - # env: - # - AMAZON=LATEST - # - KITCHEN_YAML=kitchen.travis.yml + - rvm: 2.4.5 + 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 end-to-end-amazonlinux + after_failure: + - cat .kitchen/logs/kitchen.log + env: + - AMAZON=201X + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.5 services: docker sudo: required @@ -186,6 +183,23 @@ matrix: - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - cd kitchen-tests script: + - bundle exec kitchen test end-to-end-ubuntu-1804 + after_failure: + - cat .kitchen/logs/kitchen.log + env: + - UBUNTU=18.04 + - KITCHEN_YAML=kitchen.travis.yml + - rvm: 2.4.5 + 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 end-to-end-debian-8 after_failure: - cat .kitchen/logs/kitchen.log @@ -277,40 +291,6 @@ matrix: env: - OPENSUSELEAP=42 - KITCHEN_YAML=kitchen.travis.yml -# - rvm: 2.4.5 -# 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 awesome-customers-ubuntu-ubuntu-1404 -# after_failure: -# - cat .kitchen/logs/kitchen.log -# env: -# - AWESOME_CUSTOMERS_UBUNTU=1 -# - KITCHEN_YAML=kitchen.travis.yml -# - rvm: 2.4.5 -# 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 awesome-customers-rhel-centos-7 -# after_failure: -# - cat .kitchen/logs/kitchen.log -# env: -# - AWESOME_CUSTOMERS_RHEL=1 -# - KITCHEN_YAML=kitchen.travis.yml # ### END TEST KITCHEN ONLY ### - rvm: 2.4.5 sudo: required |