commit 4ea1f4eebfe560821cdbd2d709a66b872a5b2653
author Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 12:55:22 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Fri Jan 05 12:59:44 2018 +0100
tree 1bab43f18e0af8ae4400086051e1f7ec338d47f5
parent d6d8400bbad5a3af97307356dbd7f96adbf9454f

Optimize kitchen tests for Travis CI

Change-Id: I9321a05e0a852a6508dd17d8fec2f85ef1c2a1fb

.kitchen.travis.yml

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index f87d058..93b511f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,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: