diff options
-rw-r--r-- | .travis.yml | 19 | ||||
-rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 9 |
2 files changed, 27 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ddfb6ff8e0..cbc5925d33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -139,11 +139,28 @@ matrix: - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - cd kitchen-tests script: + - bundle exec kitchen test base-amazonlinux-2 + after_failure: + - cat .kitchen/logs/kitchen.log + env: + - AMAZON=2 + - 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-amazonlinux after_failure: - cat .kitchen/logs/kitchen.log env: - - AMAZON=LATEST + - AMAZON=201X - KITCHEN_YAML=.kitchen.travis.yml - rvm: 2.4.3 services: docker diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index 54a4ec6bc2..fdf4f05f69 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -37,6 +37,15 @@ platforms: - RUN yum -y install sudo - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers +- name: amazonlinux-2 + driver: + image: dokken/amazonlinux-2 + pid_one_command: /usr/lib/systemd/systemd + intermediate_instructions: + - RUN yum -y install sudo + - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers + + - name: debian-8 driver: image: dokken/debian-8 |