commit 9bfc7e85bcbbc298fb0a98f0a21cfe26b8cd0f3b
author Petr Michalec <pmichalec@mirantis.com> Mon Feb 19 08:30:50 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Mon Feb 19 08:30:50 2018 +0000
tree 61f4228707dcdb58fc53db797cb28550a239fc72
parent 337576e3fa2283c5f5184798b4fa838b576348c1
parent 2f782279c4ea194593c2ed71a11a04fa0421d74d

Merge "Use new image for kitchen tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index ce9948e..1f6af90 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,9 +37,9 @@
   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:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 9abec6e..4e7d46a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,15 @@
   - 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