commit 12bad865b395b13d1e5e3b936243ff959a2ee482
author Martin Polreich <polreichmartin@gmail.com> Fri Feb 16 12:57:03 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Fri Feb 16 12:57:03 2018 +0100
tree 6465af1f8b9640565ba31089145e839f4c3ea3b6
parent 339d865d278e22e4311bc902acc0819decb64ceb

Use new image for kitchen tests

Change-Id: I2ea3159719496d00a9bc6a3f4046c154252e6efe

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 2f7b82b..3fb19aa 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 fac5c1a..0629a98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,18 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=server-rdiff
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=server-rdiff
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=client-rsync
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=client-rsync
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=client-s3
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=client-s3
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=client-webdav
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=client-webdav
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-rdiff
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client-rsync
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client-s3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client-webdav
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-rdiff
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client-rsync
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client-s3
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client-webdav
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-rdiff
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client-rsync
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client-s3
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client-webdav
 
 before_script:
   - set -o pipefail