commit 6fc7ec9d372b4100123094f701f0fead4e25c06b
author Hanna Arhipova <harhipova@mirantis.com> Wed Sep 22 20:34:52 2021 +0300
committer Hanna Arhipova <harhipova@mirantis.com> Mon Sep 27 09:03:15 2021 +0000
tree 6827f0b8138eb470a45d76580337b4e77aab2928
parent 2314d481ac07254944536964b47e2550b5079106

Add SALT_MODELS_SYSTEM_REF_CHANGE parameter for E\\ deployments

PROD-36517

Change-Id: I5fb0cfc828cccc67dccf841d307827d9e649cab2

jobs/templates/bm-e7-cicd-pike-odl-maas.yml

diff --git a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
index 1b21f1c..80a464e 100644
--- a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
@@ -43,6 +43,11 @@
         name: MCP_VERSION
         trim: 'false'
     - string:
+        default: ''
+        description: ''
+        name: SALT_MODELS_SYSTEM_REF_CHANGE
+        trim: 'false'
+    - string:
         default: sre-team-infra
         description: ''
         name: NODE_NAME

jobs/templates/bm-e7-cicd-pike-ovs-maas.yml

diff --git a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
index b0feb54..d8de8b1 100644
--- a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
@@ -70,6 +70,11 @@
         name: TCP_QA_REFS
         trim: 'false'
     - string:
+        default: ''
+        description: ''
+        name: SALT_MODELS_SYSTEM_REF_CHANGE
+        trim: 'false'
+    - string:
         default: refs/heads/release/2019.2.0
         description: reference to patchset in pipeline-library
         name: PIPELINE_LIBRARY_REF

src/com/mirantis/system_qa/SharedPipeline.groovy

diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index 0d4c5e3..dae2ce4 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -289,6 +289,7 @@
                 string(name: 'TCP_QA_REFS', value: "${tcp_qa_refs}"),
                 string(name: 'PIPELINE_LIBRARY_REF', value: "${pipeline_library_ref}"),
                 string(name: 'MK_PIPELINES_REF', value: "${mk_pipelines_ref}"),
+                string(name: 'SALT_MODELS_SYSTEM_REF_CHANGE', value: env.SALT_MODELS_SYSTEM_REF_CHANGE ?: ''),
                 string(name: 'COOKIECUTTER_TEMPLATE_COMMIT', value: "${cookiecutter_template_commit}"),
                 string(name: 'SALT_MODELS_SYSTEM_COMMIT', value: "${salt_models_system_commit}"),
                 string(name: 'COOKIECUTTER_REF_CHANGE', value: "${cookiecutter_ref_change}"),
@@ -445,7 +446,7 @@
                 string(name: 'DOMAIN_NAME', value: "${LAB_CONFIG_NAME}.local"),
                 string(name: 'REPOSITORY_SUITE', value: "${env.MCP_VERSION}"),
                 string(name: 'SALT_MODELS_SYSTEM_COMMIT', value: "${saltmodels_system_commit}"),
-                string(name: 'SALT_MODELS_SYSTEM_REF_CHANGE', value: env.SALT_MODELS_SYSTEM_REF_CHANGE),
+                string(name: 'SALT_MODELS_SYSTEM_REF_CHANGE', value: env.SALT_MODELS_SYSTEM_REF_CHANGE ?: ''),
                 string(name: 'COOKIECUTTER_TEMPLATE_COMMIT', value: "${cookiecuttertemplate_commit}"),
                 string(name: 'COOKIECUTTER_REF_CHANGE', value: "${cookiecutter_ref_change}"),
                 string(name: 'ENVIRONMENT_TEMPLATE_REF_CHANGE', value: "${environment_template_ref_change}"),
@@ -499,6 +500,7 @@
                 string(name: 'DEPLOY_NETWORK_NETMASK', value: "${deploy_network_mask}"),
                 string(name: 'PIPELINE_LIBRARY_REF', value: "${pipeline_library_ref}"),
                 string(name: 'MK_PIPELINES_REF', value: "${mk_pipelines_ref}"),
+                string(name: 'SALT_MODELS_SYSTEM_REF_CHANGE', value: env.SALT_MODELS_SYSTEM_REF_CHANGE ?: ''),
                 string(name: 'TCP_QA_REFS', value: "${tcp_qa_refs}"),
                 string(name: 'UPDATE_VERSION', value: "${update_version}"),
                 string(name: 'MCP_COMMON_SCRIPTS_REFS', value: "${mcp_common_scripts_ref}"),