commit 0f1dcbc55ca0f4dcea58767a9c8be0e3144ad62a
author Martin Polreich <polreichmartin@gmail.com> Tue Jul 25 11:47:00 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 25 11:47:01 2017 +0000
tree b5ba970764558bd050e46fcb44f055cb01c1221a
parent 5ca8cc90fb2db35062f66336a20b84c4bbdbee16
parent dad565f5560e6579bdd20a237d63a6974a7864a9

Merge "Allow Travis CI to run parallel tests"

.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 4f34af2..79f6159 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,12 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_cluster
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_plugin_dirs
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_plugin_dirs
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_single
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_single
 
 
 before_script:
@@ -26,7 +30,7 @@
   - 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: