diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2019-05-17 12:11:07 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2019-05-17 12:11:40 -0400 |
| commit | 55e74ea6170a37af9d1e2e64a420bb88c78d18b6 (patch) | |
| tree | c48e25928e5d0db34731aa1c60d5a2e0511f429e | |
| parent | d6d3c653e025da846d2cb4810bdb31676821b9c6 (diff) | |
| download | chef-55e74ea6170a37af9d1e2e64a420bb88c78d18b6.tar.gz | |
Fix travis platforms and remove poise on travis
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| -rw-r--r-- | .travis.yml | 23 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.travis.yml | 7 |
2 files changed, 5 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 898bab86c2..4e4bdccfc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,18 +125,9 @@ matrix: script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake rvm: 2.5.5 - env: - TEST_GEM: poise/halite - script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - rvm: 2.5.5 - - env: TEST_GEM: chef/knife-windows script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec rvm: 2.5.5 - # disable this pending a Chef 14 compat version of poise - # - env: - # TEST_GEM: poise/poise - # script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - # rvm: 2.5.5 ### START TEST KITCHEN ONLY ### - rvm: 2.5.5 services: docker @@ -183,7 +174,7 @@ 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-1404 + - bundle exec kitchen test end-to-end-ubuntu-1604 after_failure: - cat .kitchen/logs/kitchen.log env: @@ -200,7 +191,7 @@ 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-1604 + - bundle exec kitchen test end-to-end-ubuntu-1804 after_failure: - cat .kitchen/logs/kitchen.log env: @@ -217,7 +208,7 @@ 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 + - bundle exec kitchen test end-to-end-debian-8 after_failure: - cat .kitchen/logs/kitchen.log env: @@ -234,7 +225,7 @@ 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-debian-8 + - bundle exec kitchen test end-to-end-debian-9 after_failure: - cat .kitchen/logs/kitchen.log env: @@ -251,7 +242,7 @@ 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-debian-9 + - bundle exec kitchen test end-to-end-debian-10 after_failure: - cat .kitchen/logs/kitchen.log env: @@ -398,10 +389,6 @@ matrix: env: - RSPEC_OPENSUSELEAP=42 - KITCHEN_YAML=kitchen.yml - - env: - TEST_GEM: poise/halite - script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - rvm: 2.5.5 notifications: on_change: true diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml index e387e6774b..64ff400887 100644 --- a/kitchen-tests/kitchen.travis.yml +++ b/kitchen-tests/kitchen.travis.yml @@ -74,13 +74,6 @@ platforms: intermediate_instructions: - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers -- name: ubuntu-14.04 - driver: - image: dokken/ubuntu-14.04 - pid_one_command: /sbin/init - intermediate_instructions: - - RUN /usr/bin/apt-get update - - name: ubuntu-16.04 driver: image: dokken/ubuntu-16.04 |