commit ccc7cf8aca4fc8a80368615e8e77018ae6a38134
author Martin Polreich <polreichmartin@gmail.com> Mon Jul 17 16:47:33 2017 +0200
committer Martin Polreich <polreichmartin@gmail.com> Mon Jul 17 16:47:45 2017 +0200
tree fb6f3c07699f90f394789c68370403fa38fad160
parent 394f44e6205e315e103cb5fda75795fe8833f7d6

Allow Travis CI to run parallel tests

Change-Id: Ic41e19739b01cd1421d0b52c7dd12485a71c0f4f

.kitchen.travis.yml

diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
new file mode 100644
index 0000000..f847543
--- /dev/null
+++ b/.kitchen.travis.yml
@@ -0,0 +1,6 @@
+suites:
+
+  - name: <%= ENV['SUITE'] %>
+    provisioner:
+      pillars-from-files:
+        neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7a77247..1339fd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,25 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon_no_ssl
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon_no_ssl
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon_with_ssl
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon_with_ssl
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=proxy
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=proxy
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=redirect
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=redirect
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=static
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=static
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=stats
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=stats
 
 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: