commit a490b9b1b1becfa2653963b7577a3272b27f9fe8
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Nov 29 10:19:37 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Nov 29 10:19:37 2018 +0000
tree bf4d3bccf5a5f93e09dbb8e2413c894e5609b0c4
parent 9a1c9bc6cb5cf7abc6cb3d5891ae6c6dec1780c5
parent a656880a4e0320a977ebb133f0801ccc4d0b0d27

Merge "Move to Mirantis owned docker images for tests         - This is a temporary solution until we have our own images"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index c93f958..cb243b1 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -36,7 +36,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
 
 #  - name: centos-7.1

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 3667cec..c9b6ae8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,10 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=cluster
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=cluster
-    - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=single
-#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=cluster
-#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single
-#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=cluster
-#    - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=single
+    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=cluster
+    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=single
+    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=cluster
+    - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=single
 
 before_script:
   - set -o pipefail