commit 86eb164e841ef42a1612139c83f847b1fb147c15
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Nov 23 12:36:10 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Nov 23 12:36:10 2018 +0000
tree 1bdddb58f61130f061d825ebe11e66d8c309d699
parent 03c09f3e09fca5173c6bc2a110a13f32cb977abb
parent e67b8de624a862f68d7266de04ed0fb2bf74219a

Merge "Add handling multiple VRRP instances in dashboard"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 9c2a924..ec4e2e8 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -33,7 +33,7 @@
 platforms:
   - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
+      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
       platform: ubuntu
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 66adb60..ab21332 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,9 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=keepalived-cluster
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=keepalived-cluster
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=keepalived-cluster
-#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=keepalived-cluster
-#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=keepalived-cluster
+    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=keepalived-cluster
+    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=keepalived-cluster
+    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=keepalived-cluster
 
 before_script:
   - set -o pipefail