commit 36351392589726d2e428f51c46f17cc17d6b2d51
author azvyagintsev <azvyagintsev@mirantis.com> Fri Apr 12 20:00:12 2019 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Fri Apr 12 22:05:55 2019 +0300
tree 7f7d064899a406ab9434392a895cf183445f1bbe
parent 877c3ad71dbcdd4d72deec8fc7d56c7004989b61

Fix key-add call, for not-enabled user by default

 * Fix .kitchen.yml:
   Make sure kitchen test dependencies formulas
   are always fetched from correct branch

(cherry picked from commit 507f89b3326d7b9dff8802aedaa23a6c322efb37)
(cherry picked from commit a1859ca31f6e046fe3898e832a5908d84b6e93ca)

Change-Id: Ied37c40263134466dbaeab6fc61113f748e05b49
Prod-related: PROD-29155 (PROD:29155)

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 33598ba..0fcb3c2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -27,17 +27,26 @@
   dependencies:
     - name: linux
       repo: git
-      source: "https://github.com/salt-formulas/salt-formula-linux"
+      source: "https://gerrit.mcp.mirantis.com/salt-formulas/linux"
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
 
 verifier:
   name: inspec
   sudo: true
 
+docker_images:
+  - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
+  - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
 
 platforms:
-  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
+  - name: xenial-2017.7
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+      image: *xenial-20177
+      platform: ubuntu
+
+  - name: xenial-stable
+    driver_config:
+      image: *xenial-stable
       platform: ubuntu
 
 suites: