commit 0685cf28ddc13acefc0f7469a031828a2614fbaa
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Apr 11 15:29:32 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Apr 11 15:29:32 2019 +0000
tree bc8402d27f7bd0731f1015339913bb0c357ce2f3
parent 403215ab266ef98efaff940055b64c3270b1d389
parent 33d9a6ce5814c8f8dfcba80efc855eacabe41e4d

Merge "Make sure kitchen test dependencies formulas are always fetched from correct branch"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 2daaf44..2815f6e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,9 +18,11 @@
     - name: keystone
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/keystone
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
     - name: oslo_templates
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
   state_top:
     base:
       "*":