commit c1b100090ffcdd7216ea5c58d8dab8207726afc1
author Martin Polreich <polreichmartin@gmail.com> Thu Aug 24 18:14:48 2017 +0200
committer Martin Polreich <polreichmartin@gmail.com> Thu Aug 24 18:14:48 2017 +0200
tree f0f2c5ab22ec4de62927bd1149684f351bb942d6
parent 7f1bbaa91e5ca9a4e8cb516d392d35a41d28dcaa

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

Change-Id: Ibdb77015ccff6c89a3f0d4c7521e4b0df9242861

.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..25c8368 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=master_cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=master_cluster
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=slave_cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=slave_cluster
 
 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: