commit e627ed7776c98bd7c0d6ba4d7569df8f87c43696
author Petr Michalec <pmichalec@mirantis.com> Fri Feb 16 15:07:36 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Fri Feb 16 15:07:36 2018 +0000
tree 9b40219a4fc0c5ecd7565e82399745cfe5785a56
parent c2eab7fab9754dbe09de7ae2ce64e930eb4a605f
parent 1a81828425ad6e32d1dce4ffaa8c3d69c659f694

Merge "Use new image for kitchen tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index e96d842..06aaf7c 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -33,9 +33,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 93b511f..6d120af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,9 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=client
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=client
-
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client
 
 before_script:
   - set -o pipefail