commit 3d284c31593d33c45a0791aaa3b7caade19e3152
author Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 13:27:57 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 13:36:23 2018 +0100
tree 116edb8bfb8f678c49cfacc3b2712cbf34dacb85
parent d28b678564a92cfdcf5e528778abf89d7c3c6df9

Optimize kitchen tests for Travis CI

Change-Id: Ie72769c0bb84f6f3ce5f731bd6bde0432fef181a

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 265206b..55a630e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,21 +17,22 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=compute_cluster
-  - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=control_cluster
-  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=mitaka SUITE=compute_cluster
-  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=mitaka SUITE=control_cluster
-  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=newton SUITE=compute_cluster
-  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=newton SUITE=control_cluster
-  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=compute_cluster
-  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=control_cluster
+  - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=compute-cluster
+  - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=control-cluster
+  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=mitaka SUITE=compute-cluster
+  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=mitaka SUITE=control-cluster
+  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=newton SUITE=compute-cluster
+  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=newton SUITE=control-cluster
+  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=compute-cluster
+  - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=control-cluster
 
 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: