Browse Source
Use new image for kitchen tests
Change-Id: I2283943804cbed621c33db481a8852f3fb65250amaster
Martin Polreich
6 years ago
2 changed files with 14 additions and 10 deletions
+ 2
- 2
.kitchen.yml
View File
| @@ -59,9 +59,9 @@ verifier: | |||
| sudo: true | |||
| platforms: | |||
| - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%> | |||
| - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %> | |||
| driver_config: | |||
| image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%> | |||
| image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%> | |||
| platform: ubuntu | |||
| suites: | |||
+ 12
- 8
.travis.yml
View File
| @@ -17,14 +17,18 @@ install: | |||
| - bundle install | |||
| env: | |||
| - PLATFORM=trevorj/salty-whales:trusty SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=trevorj/salty-whales:xenial SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=trevorj/salty-whales:trusty SUITE=slave-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=trevorj/salty-whales:xenial SUITE=slave-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=trevorj/salty-whales:trusty SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| - PLATFORM=trevorj/salty-whales:xenial SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| - PLATFORM=trevorj/salty-whales:trusty SUITE=slave-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| - PLATFORM=trevorj/salty-whales:xenial SUITE=slave-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=slave-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=slave-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster MYSQL_VER=5.6 GALERA_VER=3 | |||
| # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=slave-cluster MYSQL_VER=5.7 GALERA_VER=3 | |||
| before_script: | |||
| - set -o pipefail | |||
Loading…