commit 114dab716fe30cab28e2de30ea362621fb0b2fc4
author Jakub Josef <jjosef@mirantis.com> Thu Feb 22 10:36:07 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Thu Feb 22 10:36:07 2018 +0000
tree 5a6b4f2d381f28f619b8f7f3d9cf701232965e88
parent 44111a4e1aad00dc60cbb4a38ec1978ea0939b4c
parent bf901eaca91e869dd69f765bc0b9d5fa4725ab49

Merge "Use new image for kitchen tests"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 5020ac0..2c909a9 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,9 +30,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 42e33d7..31fa32f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,12 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=client
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=server
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=client
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server
 
 before_script:
   - set -o pipefail