commit 3a0398ca3472369a710a2511090e0dffce62c59b
author Martin Polreich <polreichmartin@gmail.com> Fri Aug 25 10:58:38 2017 +0200
committer Martin Polreich <polreichmartin@gmail.com> Fri Aug 25 10:58:38 2017 +0200
tree 9a70ab7c6021239ac56948ed5c25350a229f2530
parent dc3604503361be2ea2a6d3d13d62da182d79b5e8

Update .travis.yml and .kitchen.yml files for parallel testing

Change-Id: Icc0d430c5543f653515fc54ff45d392282b24c2a

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7a77247..2c41ae6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,17 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=alertmanager
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=alertmanager
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=server
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=server
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
 
 notifications:
   webhooks: