commit 7b2e81bb9e53332900fead48481f9ea7692b06c5
author Hanna Arhipova <harhipova@mirantis.com> Mon Sep 27 14:11:53 2021 +0300
committer Hanna Arhipova <harhipova@mirantis.com> Mon Sep 27 18:07:25 2021 +0000
tree 573f01a69e36def9c06fd1899a10425048cb0e3e
parent 894a768ee6b6f5583647a3d6aae0ba06cf089222

Cherry pick a patch from a reclass-system to not master

PROD-36517


Change-Id: I093f1301c2e0acb1d6471946eae889b8417dd8e8

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 5785efb..200ae8d 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -548,13 +548,8 @@
   cmd: |
     set -e;
     set -x;
-    {%- if 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;
-    {%- endfor %}
-    popd;
-    {%- elif SALT_MODELS_SYSTEM_COMMIT != '' %}
+
+    {%- if SALT_MODELS_SYSTEM_COMMIT != '' %}
     pushd /srv/salt/reclass/classes/system/
     git checkout {{ SALT_MODELS_SYSTEM_COMMIT }};
     popd;
@@ -565,6 +560,14 @@
     popd;
     {%- endif %}
 
+    {%- if 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;
+    {%- endfor %}
+    popd;
+    {%- endif %}
+
     {%- if IS_CONTRAIL_LAB %}
     export REPLACE_DIRS="/srv/salt/reclass/classes/ /srv/salt/reclass/nodes/"
     # vSRX IPs for tcp-qa images have 172.16.10.90 hardcoded