commit 4d816eb2d8e3c060934417ed6f722a9672eb3257
author sgudz <sgudz@mirantis.com> Mon Nov 13 11:58:05 2017 +0200
committer sgudz <sgudz@mirantis.com> Mon Nov 13 11:58:17 2017 +0200
tree 4274116b12e8abd43dbebd0a7f906c3677e60dd2
parent 644fa069a207d5068b09e1161ce9b2957ca83bbd

Add possibility to use cookiecutter REF_CHANGE

Change-Id: Ia4ee17594d8881accd68f6fa7db96f85e8cefa14

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index e5781ed..7329d73 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -8,6 +8,7 @@
 {% set SALT_MODELS_SYSTEM_REPOSITORY = os_env('SALT_MODELS_SYSTEM_REPOSITORY','https://gerrit.mcp.mirantis.net/salt-models/reclass-system') %}
 {% set SALT_MODELS_SYSTEM_COMMIT = os_env('SALT_MODELS_SYSTEM_COMMIT','') %}
 {% set SALT_MODELS_SYSTEM_REF_CHANGE = os_env('SALT_MODELS_SYSTEM_REF_CHANGE','') %}
+{% set COOKIECUTTER_REF_CHANGE = os_env('COOKIECUTTER_REF_CHANGE','') %}
 
 {% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'testing') %}
 
@@ -101,7 +102,7 @@
     pushd classes/system/ && \
     git checkout {{ SALT_MODELS_SYSTEM_COMMIT }} && \
     popd && \
-    {%- elif SALT_MODELS_SYSTEM_REF_CHANGE != '' -%}
+    {%- elif SALT_MODELS_SYSTEM_REF_CHANGE != '' %}
     pushd classes/system/ && \
     {%- for item in SALT_MODELS_SYSTEM_REF_CHANGE.split(" ") %}
     git fetch {{ SALT_MODELS_SYSTEM_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD && \
@@ -181,6 +182,13 @@
     set -e;
     pip install cookiecutter
     export GIT_SSL_NO_VERIFY=true; git clone  https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates /tmp/cookiecutter-templates
+
+    {%- if COOKIECUTTER_REF_CHANGE != '' %}
+    pushd /tmp/cookiecutter-templates
+    git fetch https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates {{ COOKIECUTTER_REF_CHANGE }} && git checkout FETCH_HEAD
+    popd
+    {%- endif %}
+
     mkdir -p /srv/salt/reclass/classes/cluster/
     mkdir -p /srv/salt/reclass/classes/system/
     mkdir -p /srv/salt/reclass/classes/service/
@@ -244,7 +252,7 @@
     pushd /srv/salt/reclass/classes/system/
     git checkout {{ SALT_MODELS_SYSTEM_COMMIT }} && \
     popd
-    {%- elif SALT_MODELS_SYSTEM_REF_CHANGE != '' -%}
+    {%- elif SALT_MODELS_SYSTEM_REF_CHANGE != '' %}
     pushd /srv/salt/reclass/classes/system/
     {%- for item in SALT_MODELS_SYSTEM_REF_CHANGE.split(" ") %}
     git fetch {{ SALT_MODELS_SYSTEM_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD