commit 8f877bcbd1be650cb2c4ce539559fb9773a882c3
author Petr Michalec <pmichalec@mirantis.com> Wed Jan 10 09:39:35 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Wed Jan 10 09:39:35 2018 +0000
tree 0c92fa56249ea9428510026af4668e232c095503
parent e7fc6ab4df3b3253f21ccc0471fa94c870fcfe56
parent 09bc179cc9d7ec79e01ab1d3e9e97803c689fef0

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 2774f45..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        ntp.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 3afcf15..2042e1d 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: