commit 3727cd18f72824c677599377999a96a60ce43746
author Martin Polreich <polreichmartin@gmail.com> Tue Jul 25 11:45:53 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 25 11:45:53 2017 +0000
tree 4df9f058d14419cad6b3e8560e9acc5ad5fce750
parent 9b99f79087eb6da7efbbc258716c33e8711d836c
parent dfe74ac2ac4f6f824ab5d9d42a8ac487f4b8e315

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..e7f6583 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,21 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_rdiff
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_rdiff
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=client_rsync
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client_rsync
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=client_s3
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client_s3
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=client_webdav
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=client_webdav
 
 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: