commit 055c6ce1353673d09dea05760f1c58093ca83766
author Filip Pytloun <fpytloun@mirantis.com> Mon Jan 15 12:12:04 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Mon Jan 15 12:12:04 2018 +0000
tree 4f89d36ceb045f91c6d89144b9bc6095e44afbae
parent 0b17d6a9c61eba5686784e55ec21d3932a5ca3b6
parent 07b406c94e905eb47f28cb021ad2008b4aca638e

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1339fd9..2d793e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon_no_ssl
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon_no_ssl
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon_with_ssl
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon_with_ssl
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon-no-ssl
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon-no-ssl
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=horizon-with-ssl
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=horizon-with-ssl
     - PLATFORM=trevorj/salty-whales:trusty SUITE=proxy
     - PLATFORM=trevorj/salty-whales:xenial SUITE=proxy
     - PLATFORM=trevorj/salty-whales:trusty SUITE=redirect
@@ -35,7 +35,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: