Browse Source

Merge "Update .travis.yml and .kitchen.yml files for parallel testing"

revert-bumpto57-2
Martin Polreich 7 years ago
parent
commit
97b56a4c85
2 changed files with 11 additions and 3 deletions
  1. +6
    -0
      .kitchen.travis.yml
  2. +5
    -3
      .travis.yml

+ 6
- 0
.kitchen.travis.yml View File

suites:

- name: <%= ENV['SUITE'] %>
provisioner:
pillars-from-files:
neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

+ 5
- 3
.travis.yml View File

- bundle install - bundle install


env: env:
- PLATFORM=trevorj/salty-whales:trusty
- PLATFORM=trevorj/salty-whales:xenial
- PLATFORM=trevorj/salty-whales:trusty SUITE=master_cluster
- PLATFORM=trevorj/salty-whales:xenial SUITE=master_cluster
- PLATFORM=trevorj/salty-whales:trusty SUITE=slave_cluster
- PLATFORM=trevorj/salty-whales:xenial SUITE=slave_cluster


before_script: before_script:
- set -o pipefail - set -o pipefail
- make test | tail - make test | tail


script: 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: notifications:
webhooks: webhooks:

Loading…
Cancel
Save