Browse Source

Use new image for kitchen tests

Change-Id: I2283943804cbed621c33db481a8852f3fb65250a
master
Martin Polreich 6 years ago
parent
commit
664b13c2e8
2 changed files with 14 additions and 10 deletions
  1. +2
    -2
      .kitchen.yml
  2. +12
    -8
      .travis.yml

+ 2
- 2
.kitchen.yml View File

sudo: true sudo: true


platforms: platforms:
- name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
- name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
driver_config: driver_config:
image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
platform: ubuntu platform: ubuntu


suites: suites:

+ 12
- 8
.travis.yml View File

- bundle install - bundle install


env: 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: before_script:
- set -o pipefail - set -o pipefail

Loading…
Cancel
Save