diff options
| author | Tim Smith <tsmith@chef.io> | 2018-06-16 13:11:28 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-06-16 13:59:52 -0700 |
| commit | 5d05a0fd0b589fefd5324255a3818415a2b63281 (patch) | |
| tree | bf6627d298fe281d799514a43065a165e9d9aef5 /.travis.yml | |
| parent | aa4f3285f3e49919e29f40337183fd0510baaee5 (diff) | |
| download | chef-5d05a0fd0b589fefd5324255a3818415a2b63281.tar.gz | |
Remove awesome customers testing and update kitchen configs
Awesome customers cookbook testing isn't even correct from learn chef anymore and it's not coming back in this form. There's no reason to keep carrying it around.
This change also deps on kitchen 1.21 and uses the new name for the configs. Much easier to find if you're browsing the source in Finder/Explorer.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 57 |
1 files changed, 11 insertions, 46 deletions
diff --git a/.travis.yml b/.travis.yml index 36fd343809..84d8c71543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,7 +132,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - AMAZON=2 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -149,7 +149,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - AMAZON=201X - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -166,7 +166,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - UBUNTU=14.04 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -183,7 +183,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - UBUNTU=16.04 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -200,7 +200,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - UBUNTU=18.04 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -217,7 +217,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - DEBIAN=8 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -234,7 +234,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - DEBIAN=9 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -251,7 +251,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - CENTOS=6 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -268,7 +268,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - CENTOS=7 - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -285,7 +285,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - FEDORA=latest - - KITCHEN_YAML=.kitchen.travis.yml + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.4.4 services: docker sudo: required @@ -302,42 +302,7 @@ matrix: - cat .kitchen/logs/kitchen.log env: - OPENSUSELEAP=42 - - KITCHEN_YAML=.kitchen.travis.yml -# - rvm: 2.4.4 -# 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.4 -# 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 ### + - KITCHEN_YAML=kitchen.travis.yml - rvm: 2.5.1 sudo: required before_install: |