From f3b0b9402096df48c4f66878e750a1b9488c5727 Mon Sep 17 00:00:00 2001 From: Martin Polreich Date: Wed, 21 Feb 2018 14:30:33 +0100 Subject: [PATCH] Use new image for kitchen tests Change-Id: Ieaaba3f1a550e456914d160e5930077986fdbe50 --- .kitchen.yml | 4 ++-- .travis.yml | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index c8edb38..d5424a6 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -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: diff --git a/.travis.yml b/.travis.yml index 34fdc99..0764388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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