commit bde44befa9dc4a675a8d1f1760f396ba17694b46
author Jakub Josef <jjosef@mirantis.com> Thu Feb 22 10:28:03 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Thu Feb 22 10:28:03 2018 +0000
tree 333605a5850f231f771677a28a0ecc91dd567873
parent 44faaecda30c163635519adf0891c45e6ac37072
parent 8cc4957289051fe07a61d5a29d5dd620b2b69db3

Merge "Use new image for kitchen tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 091dfb6..68166d1 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,9 +29,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 37c445a..91e0a46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,9 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=memcached-server
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=memcached-server
-
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=memcached-server
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=memcached-server
+    # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=memcached-server
 
 before_script:
   - set -o pipefail