Linux-Help/formula-prometheus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge "Use new image for kitchen tests"

Browse source
This commit is contained in:
Jakub Josef 2018-02-22 10:39:42 +00:00 committed by Gerrit Code Review
parent a30435408e f3b0b94020
commit b21c46a2ac
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.kitchen.yml
View file

@ -30,9 +30,9 @@ verifier:
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:

10
.travis.yml
View file

@ -17,10 +17,12 @@ install:
- bundle install
env:
- PLATFORM=trevorj/salty-whales:trusty SUITE=alertmanager
- PLATFORM=trevorj/salty-whales:xenial SUITE=alertmanager
- PLATFORM=trevorj/salty-whales:trusty SUITE=server
- PLATFORM=trevorj/salty-whales:xenial SUITE=server
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=alertmanager
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=alertmanager
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=alertmanager
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server
before_script:
- set -o pipefail