From: Martin Polreich Date: Fri, 25 Aug 2017 10:05:37 +0000 (+0200) Subject: Update .travis.yml and .kitchen.yml files for parallel testing X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=c231d5933221104ee5e4f4db1311360ff75acc69 Update .travis.yml and .kitchen.yml files for parallel testing Change-Id: Ifa17dd1e87f0cb8d9184e1dbe7b97a90d227ac9c --- diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml new file mode 100644 index 0000000..f847543 --- /dev/null +++ b/.kitchen.travis.yml @@ -0,0 +1,6 @@ +suites: + + - name: <%= ENV['SUITE'] %> + provisioner: + pillars-from-files: + neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls diff --git a/.travis.yml b/.travis.yml index 7a77247..2e36211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,15 +17,19 @@ install: - bundle install env: - - PLATFORM=trevorj/salty-whales:trusty - - PLATFORM=trevorj/salty-whales:xenial + - PLATFORM=trevorj/salty-whales:trusty SUITE=client + - PLATFORM=trevorj/salty-whales:xenial SUITE=client + - PLATFORM=trevorj/salty-whales:trusty SUITE=cluster + - PLATFORM=trevorj/salty-whales:xenial SUITE=cluster + - PLATFORM=trevorj/salty-whales:trusty SUITE=single + - PLATFORM=trevorj/salty-whales:xenial SUITE=single before_script: - set -o pipefail - make test | tail script: - - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration + - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration notifications: webhooks: