commit a122a3ea1e02110272bcbc72f65e3c3ae8142949
author Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 13:26:47 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 13:26:47 2018 +0100
tree 8396a12a7855f8a821a1575bf3ab08937f2343b5
parent b915754bb1f5ad0a6d8d91c65aab3059d567c8e1

Optimize kitchen tests for Travis CI

Change-Id: I98e1b61bb49a449e6bccd95d017251c904d21a6f

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1339fd9..2d793e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon_no_ssl
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon_no_ssl
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon_with_ssl
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon_with_ssl
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon-no-ssl
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon-no-ssl
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon-with-ssl
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon-with-ssl
     - PLATFORM=trevorj/salty-whales:trusty SUITE=proxy
     - PLATFORM=trevorj/salty-whales:xenial SUITE=proxy
     - PLATFORM=trevorj/salty-whales:trusty SUITE=redirect
@@ -35,7 +35,8 @@
   - 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: