commit e2acc7ffde1560272c2a7d9295b9fdb960688663
author Filip Pytloun <fpytloun@mirantis.com> Mon Jan 15 12:15:07 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Mon Jan 15 12:15:07 2018 +0000
tree bb4e10687b5d04284d56ac486df2612bf632d9d6
parent 68676b29da1aad7a16ec2bab46f0edf0496d91a8
parent 5eeec5de23e29c25afa4285572c89107231cd02f

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 75dd1d1..94476d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,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: