commit e3105caeb1d453a53979c5e8a6876bcee6a48f93
author Filip Pytloun <fpytloun@mirantis.com> Mon Jan 15 12:12:48 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Mon Jan 15 12:12:48 2018 +0000
tree 8033da27afb1e01db8aff80afe11c3c81738a2d9
parent 98d28193eeee88d07d80c1e8f2d5d00f88cc1daf
parent 34ef0bedf75877186b928ddd29d3d67005f937c6

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 77b9e3c..9846a72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,12 +19,12 @@
 env:
     - PLATFORM=trevorj/salty-whales:trusty SUITE=admin
     - PLATFORM=trevorj/salty-whales:xenial SUITE=admin
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_contrail
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_contrail
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_general_service
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_general_service
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single_openstack_service
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single_openstack_service
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-contrail
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-contrail
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-general-service
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-general-service
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-openstack-service
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-openstack-service
     - PLATFORM=trevorj/salty-whales:trusty SUITE=stats
     - PLATFORM=trevorj/salty-whales:xenial SUITE=stats
 
@@ -33,7 +33,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: