commit 1b83901bbb0b485342f08a223b4d59979fd8f23c
author Martin Polreich <polreichmartin@gmail.com> Tue Jul 25 11:46:11 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 25 11:46:11 2017 +0000
tree dd9884834b43288036eabf382b8883bec4ae3288
parent 0628aaa1ae3192d5dfc45a3f9cc524b442e4921c
parent 85bfcc9dd7474477960103ecd44bdb4d3a0f4b22

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 7a77247..e70bb99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,19 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_ceph
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_ceph
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single
 
 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: