diff options
| author | Tim Smith <tsmith@chef.io> | 2018-03-03 00:01:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 00:01:42 -0800 |
| commit | cadc9b3fbc51a1019b868d59259f852154633d0c (patch) | |
| tree | 875c3feaa6578a6f8e0da474f1d650fca4560582 | |
| parent | f008d1af717a3ef147f00a796b99ca4679745bd6 (diff) | |
| parent | 3af39331e25dbde89256f816614ea103dfb30a77 (diff) | |
| download | chef-cadc9b3fbc51a1019b868d59259f852154633d0c.tar.gz | |
Merge pull request #6937 from chef/test_18.04
Add Ubuntu 18.04 Testing in Travis
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 10 |
2 files changed, 26 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 7e6325c36d..30d8ef45a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -190,6 +190,23 @@ matrix: - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - cd kitchen-tests script: + - bundle exec kitchen test base-ubuntu-1804 + after_failure: + - cat .kitchen/logs/kitchen.log + env: + - UBUNTU=18.04 + - KITCHEN_YAML=.kitchen.travis.yml + - rvm: 2.4.3 + 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 base-debian-8 after_failure: - cat .kitchen/logs/kitchen.log diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index a8bc149b94..54a4ec6bc2 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -93,6 +93,14 @@ platforms: - RUN /usr/bin/apt-get update - RUN /usr/bin/apt-get -y install sudo +- name: ubuntu-18.04 + driver: + image: dokken/ubuntu-18.04 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN /usr/bin/apt-get update + - RUN /usr/bin/apt-get -y install sudo + - name: opensuse-leap driver: image: dokken/opensuse-leap @@ -105,7 +113,7 @@ suites: run_list: - recipe[base::default] - name: awesome_customers_ubuntu - includes: [ubuntu-14.04, ubuntu-16.04] + includes: [ubuntu-14.04, ubuntu-16.04, ubuntu-18.04] run_list: - recipe[awesome_customers_ubuntu_wrapper::default] - name: awesome_customers_rhel |