diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-04-09 15:00:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 15:00:55 -0700 |
| commit | d3323695544d257e909753fc76b8eb689f0feb73 (patch) | |
| tree | cdc1062ef1b8b160dfa1c69b04a286a97df0a4d0 | |
| parent | 3a87c705090c7f44d51666c0bf88add9c2445e9a (diff) | |
| parent | 777560c372d56b1fca1138408019a29b25fda658 (diff) | |
| download | chef-d3323695544d257e909753fc76b8eb689f0feb73.tar.gz | |
Merge pull request #8348 from chef/testing
Add Debian 10 testing to Travis
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.travis.yml | 7 |
2 files changed, 23 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 6368df2a74..627ea6f726 100644 --- a/.travis.yml +++ b/.travis.yml @@ -109,11 +109,6 @@ matrix: TEST_GEM: chef/knife-windows script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec rvm: 2.6.2 - # 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.6.2 ### START TEST KITCHEN ONLY ### - rvm: 2.5.5 services: docker @@ -221,6 +216,22 @@ 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-10 + after_failure: + - cat .kitchen/logs/kitchen.log + env: + - DEBIAN=10 + - KITCHEN_YAML=kitchen.travis.yml + - rvm: 2.5.5 + services: docker + 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-centos-6 after_failure: - cat .kitchen/logs/kitchen.log diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml index f65dcdc420..f445f5a36e 100644 --- a/kitchen-tests/kitchen.travis.yml +++ b/kitchen-tests/kitchen.travis.yml @@ -57,6 +57,13 @@ platforms: intermediate_instructions: - RUN /usr/bin/apt-get update +- name: debian-10 + driver: + image: dokken/debian-10 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN /usr/bin/apt-get update + - name: centos-6 driver: image: dokken/centos-6 |