summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-11-21 10:57:44 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-11-21 10:57:44 -0800
commit1f29c18f4d1660e20037945cf046f35dee45ca02 (patch)
treeb8cb4a56a9ef3d6135b1bbcb7125e7c68fb8ae90
parentb488d5ba2afec65939cb4a267151fd26a21b3d1a (diff)
downloadchef-1f29c18f4d1660e20037945cf046f35dee45ca02.tar.gz
add amazonlinus to travis matrix
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--.travis.yml18
-rw-r--r--kitchen-tests/.kitchen.travis.yml9
2 files changed, 27 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index d0a89ede06..b08ec2d049 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -264,6 +264,24 @@ matrix:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
script:
+ - bundle exec kitchen test webapp-amazonlinux
+ after_failure:
+ - cat .kitchen/logs/kitchen.log
+ env:
+ - AMAZONLINUX=LATEST
+ - KITCHEN_YAML=.kitchen.travis.yml
+ - rvm: 2.3.1
+ 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 changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ before_script:
+ - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+ - cd kitchen-tests
+ script:
- bundle exec kitchen test awesome-customers-ubuntu-ubuntu-1404
after_failure:
- cat .kitchen/logs/kitchen.log
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 6dd43d0879..d0e17efa8c 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -115,6 +115,15 @@ platforms:
intermediate_instructions:
- RUN zypper refresh
+- name: amazonlinux
+ driver:
+ image: amazonlinux:latest
+ pid_one_command: /sbin/init
+ intermediate_instructions:
+ - RUN yum clean all
+ - RUN yum -y install which initscripts net-tools sudo wget
+ - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
+
suites:
- name: webapp
run_list: