From 8961c751310157ba61e8ea00b2c35550385331c7 Mon Sep 17 00:00:00 2001 From: Martin Polreich Date: Wed, 11 Apr 2018 12:59:11 +0200 Subject: [PATCH] Add Salt 2018.3 tests Change-Id: I2a9059abae3c5015ea2b7adc51be1ef1d1bfad33 --- .kitchen.yml | 2 +- .travis.yml | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index f69baf6..13a6764 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -39,7 +39,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: diff --git a/.travis.yml b/.travis.yml index e60b766..11697ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,18 +17,26 @@ install: - bundle install env: - - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 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=curator - - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client - - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 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=curator - - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client -# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-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=curator -# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=cluster + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=curator + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=cluster + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=curator + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=single + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=cluster + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=curator + - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=client +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=cluster +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=curator +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=single +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=cluster +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=curator +# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=client before_script: - set -o pipefail -- 2.32.7