commit a046c376ea182c8c47e05af11dc31c5cb38a5093
author Filip Pytloun <fpytloun@mirantis.com> Mon Jan 15 12:14:04 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Mon Jan 15 12:14:04 2018 +0000
tree f85510c0c0d67768095ad1ed42302f17b02a97bf
parent 3c8110d2aa1b37fb41484db2b05ad37e6bad1299
parent 7b02b3656eb04c0f670d2016697e7680bc832c44

Merge "Remove salt-master, reclass from pkg dependencis"

.kitchen.travis.yml

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index ac3ca4c..653f024 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: