commit 0892bf74621514168e49ee2d0ed8b508685a2a46
author Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 12:35:58 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 13:43:40 2018 +0100
tree a828d5eb83911e996ea5a0ba5646f363d0e8091a
parent a71e303a83d3189f2b9321b2528fd6f40a89ecc4

Optimize kitchen tests for Travis CI

Change-Id: I48d08b1dea86f9c2fbc3abac810a817b43bd2f93

.kitchen.travis.yml

diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index aaa9784..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        aodh.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 46d3f84..cc1ea51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,19 @@
   - bundle install
 
 env:
-  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server_cluster
-  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server_single
+  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server-cluster
+  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server-single
   # Missing Trusty packages for aodh
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server_cluster
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server_single
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-cluster
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-single
 
 before_script:
   - set -o pipefail
   - make test | tail
 
 script:
-  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
+  - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
+  - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
 
 notifications:
   webhooks: