commit dc23313f0afcea1303e43d8fdbd6e4a7fe99a294
author Filip Pytloun <fpytloun@mirantis.com> Mon Jan 15 12:17:03 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Mon Jan 15 12:17:03 2018 +0000
tree 7e7ed298d9113af31cb13d0c228c8f2e83823660
parent 4abc3bb33594ddb93396cd6d16afff356755198d
parent c83021fcb9300fde99c475d620702c6f4e0293c7

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

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 6211b97..d8e1607 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -42,6 +42,6 @@
   - name: single
     provisioner:
       pillars-from-files:
-        helm.sls: tests/pillar/single.sls        
+        helm.sls: tests/pillar/single.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index de3b343..7f908f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,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: