Optimize kitchen tests for Travis CI
Change-Id: I1f7f4840386187f3939ba1a254212d51fa27a1b2
diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
deleted file mode 100644
index f847543..0000000
--- a/.kitchen.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-suites:
-
- - name: <%= ENV['SUITE'] %>
- provisioner:
- pillars-from-files:
- neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index fa7c5f9..64743ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,16 @@
- bundle install
env:
- - PLATFORM=trevorj/salty-whales:xenial SUITE=client_compose
- - PLATFORM=trevorj/salty-whales:xenial SUITE=client_container
- - PLATFORM=trevorj/salty-whales:xenial SUITE=host_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=client-compose
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=client-container
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=host-single
before_script:
- 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: