Browse Source

Merge "Add Salt 2018.3 tests"

pull/6/merge
Petr Michalec 6 years ago
parent
commit
15440001b1
2 changed files with 11 additions and 7 deletions
  1. +1
    -1
      .kitchen.yml
  2. +10
    -6
      .travis.yml

+ 1
- 1
.kitchen.yml View File

@@ -31,7 +31,7 @@ verifier:
platforms:
- name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
driver_config:
image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
platform: ubuntu

suites:

+ 10
- 6
.travis.yml View File

@@ -17,12 +17,16 @@ install:
- bundle install

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

before_script:
- set -o pipefail

Loading…
Cancel
Save