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

.kitchen.travis.yml

+suites:
+
+  - name: <%= ENV['SUITE'] %>
+    provisioner:
+      pillars-from-files:
+        neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

.travis.yml

   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
-
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion_default
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion_default
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=master_default
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=master_default
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion_default
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion_default
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=control_default
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=control_default
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion_multi_master_failover
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion_multi_master_failover
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen converge || true
-  - test ! -e .kitchen.yml || bundle exec kitchen verify -t tests/integration
+  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
 
 notifications:
   webhooks: