From 2f782279c4ea194593c2ed71a11a04fa0421d74d Mon Sep 17 00:00:00 2001 From: Martin Polreich Date: Fri, 16 Feb 2018 16:16:27 +0100 Subject: [PATCH] Use new image for kitchen tests Change-Id: Ieaf8bb525f2fb19216f2712b48ae411606f2d7ce --- .kitchen.yml | 4 ++-- .travis.yml | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index ce9948e..1f6af90 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -37,9 +37,9 @@ verifier: sudo: true 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 9abec6e..4e7d46a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,15 @@ install: - bundle install env: - - PLATFORM=trevorj/salty-whales:trusty SUITE=client - - PLATFORM=trevorj/salty-whales:xenial SUITE=client - - 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=client + - 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=client + - 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=client +# - 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: - set -o pipefail -- 2.32.7