From f25c6af5b6e639a6e6052a27d68637aa8088f6ce Mon Sep 17 00:00:00 2001
From: Martin Polreich <polreichmartin@gmail.com>
Date: Fri, 5 Jan 2018 13:04:24 +0100
Subject: [PATCH] Optimize kitchen tests for Travis CI

Change-Id: I93dee77ae8fe1263f2b4983cc5cf9e715e5848b5
---
 .kitchen.travis.yml | 6 ------
 .travis.yml         | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 .kitchen.travis.yml

diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index 031bbee..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
-  - name: <%= ENV['SUITE'] %>
-    provisioner:
-      pillars-from-files:
-        elasticsearch.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index 0b7cfbe..684984f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,8 @@ before_script:
   - 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:
-- 
2.32.7