commit 08acf9fb1094f717de1c1fc756500d44a4107781
author Valentyn Yakovlev <valentyn.yakovlev@gmail.com> Wed Jun 07 14:02:36 2017 +0300
committer Tatyanka Leontovich <tleontovich@mirantis.com> Wed Jun 07 07:19:15 2017 -0400
tree 19b3771675644d5ea55237303b90bdc5513c9188
parent 41e8ad7180e189f80d81e9a249af7442761ca417

Fix checkout to salt models commit

Change-Id: I70e9c89a0ee2a9729cdf4e85bb9d1655d8484308
Reviewed-on: https://review.gerrithub.io/364426
Reviewed-by: <apanchenko@mirantis.com>
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>

tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml

diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
index d9011bb..3e3e3e1 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
@@ -2,6 +2,7 @@
 {% from 'virtual-mcp11-k8s-contrail/underlay.yaml' import REPOSITORY_SUITE with context %}
 
 {% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab') %}
+{% set SALT_MODELS_BRANCH = os_env('SALT_MODELS_BRANCH','master') %}
 {% set SALT_MODELS_COMMIT = os_env('SALT_MODELS_COMMIT','master') %}
 
 # Address pools for reclass cluster model are taken in the following order:
@@ -60,7 +61,8 @@
 - description: Clone reclass models with submodules
   cmd: |
     ssh-keyscan -H github.com >> ~/.ssh/known_hosts;
-    git clone -b {{ SALT_MODELS_COMMIT }} --recurse-submodules {{ SALT_MODELS_REPOSITORY }} /srv/salt/reclass;
+    git clone -b {{ SALT_MODELS_BRANCH }} --recurse-submodules {{ SALT_MODELS_REPOSITORY }} /srv/salt/reclass;
+    pushd /srv/salt/reclass && git checkout {{ SALT_MODELS_COMMIT }} && popd;
     mkdir -p /srv/salt/reclass/classes/service;
 
     # Replace firstly to an intermediate value to avoid intersection between