commit 7179733aa08b2d6d07d02649a6facd5e9320740a
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Feb 19 14:53:32 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Mon Feb 19 14:53:32 2018 +0000
tree 17bd65816c4965cf9d8823327e48f5fea667e86e
parent cc0433d148457aff6f09b086c25472f59339917f
parent dab174c9c28cd83d5dc3edd2e7223cde897fd5fc

Merge "Use new image for kitchen tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index c3b24a2..3a181b6 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -34,9 +34,9 @@
 
 
 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 31d2f50..7f03f12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,18 +17,15 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-cluster
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-cluster
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-plugin-dirs
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-plugin-dirs
-    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-single
-    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-single
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-cluster
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-cluster
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-plugin-dirs
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-plugin-dirs
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-single
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-cluster
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-plugin-dirs
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-cluster
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-plugin-dirs
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-single
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-cluster
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-plugin-dirs
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-single
 
 
 before_script: