commit e3b0040b1667801a3edf575ad586a49973de96e1
author Petr Michalec <pmichalec@mirantis.com> Wed Jan 10 09:40:02 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Wed Jan 10 09:40:02 2018 +0000
tree 463586f23d7b93634429a09ab0e3d9554d64e0f5
parent bc6954656376a5673c41334e63c433c58604e002
parent 2976d4d7ace4f28373ca00e01595657ea07b96a3

Merge "Optimize kitchen tests for Travis CI"

.kitchen.travis.yml

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index f3496bd..0fb6f97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,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: