Browse Source

Merge "Use new image for kitchen tests"

pull/6/merge
Jakub Josef 6 years ago
parent
commit
c8cc11503a
2 changed files with 8 additions and 6 deletions
  1. +2
    -2
      .kitchen.yml
  2. +6
    -4
      .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:

+ 6
- 4
.travis.yml View File

- bundle install - bundle install


env: env:
- 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
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=cluster
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=cluster
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=cluster
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single


before_script: before_script:
- set -o pipefail - set -o pipefail

Loading…
Cancel
Save