summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-12-07 12:56:04 -0800
committerTim Smith <tsmith@chef.io>2017-12-07 12:56:04 -0800
commitb6cfb6e109174bbd95977eab36b78c89aad0a1e1 (patch)
tree6c576f479de45807714ce18fde685563deb07a8d
parentb421a502b4bc2efef7619e999d3a2a6d13cc0af2 (diff)
downloadchef-b6cfb6e109174bbd95977eab36b78c89aad0a1e1.tar.gz
Remove duplicate amazon linux test in the travis config
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.travis.yml29
1 files changed, 4 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml
index be66d46438..3eeab89a6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,6 +89,10 @@ matrix:
TEST_GEM: poise/poise
script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
rvm: 2.4.2
+ - env:
+ TEST_GEM: chef/knife-windows
+ script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
+ rvm: 2.4.2
### START TEST KITCHEN ONLY ###
#
- rvm: 2.4.2
@@ -327,31 +331,6 @@ matrix:
- cat /tmp/out.txt
- sudo cat /var/log/squid3/cache.log
- sudo cat /var/log/squid3/access.log
- - rvm: 2.4.2
- 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 docgen guard integration maintenance omnibus_package --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 base-amazonlinux
- after_failure:
- - cat .kitchen/logs/kitchen.log
- env:
- - AMAZONLINUX=LATEST
- - KITCHEN_YAML=.kitchen.travis.yml
- # this has been broken for some time and running incorrectly, see:
- #
- # see https://github.com/chef/knife-windows/pull/421
- - env:
- TEST_GEM: chef/knife-windows
- script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
- rvm: 2.4.2
notifications:
on_change: true