Add 'current-release' and 'previous-release' variables to JJB
Change-Id: If6cb2bfa6a7102413188ba81d87a7575f741271d
Related-Prod: PROD-34955
diff --git a/jobs/global.yaml b/jobs/global.yaml
index 800afa0..9a86ed2 100644
--- a/jobs/global.yaml
+++ b/jobs/global.yaml
@@ -4,3 +4,5 @@
Do not edit this job through the web ! <br>
Please use jenkins-job-builder in git <br>
git clone ssh://gerrit.mcp.mirantis.com:29418/mcp/tcp-qa
+ current-version: 2019.2.10
+ previous-version: 2019.2.9
\ No newline at end of file
diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index 06ce712..8cd319c 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -35,7 +35,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.9
+ default: '{current-version}'
description: ''
name: MCP_VERSION
trim: 'false'
@@ -72,23 +72,23 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{current-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{current-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -173,7 +173,7 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
@@ -183,12 +183,12 @@
name: TEMPEST_PATTERN
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.9
+ default: '{current-version}'
description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index 0fb0eef..f5cd494 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -35,7 +35,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.9
+ default: '{current-version}'
description: ''
name: MCP_VERSION
trim: 'false'
@@ -72,23 +72,23 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{current-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{current-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -173,17 +173,17 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.9
+ default: '{current-version}'
description: ''
name: UPDATE_VERSION
trim: 'false'
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index 933dce2..f24c3f0 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -35,7 +35,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{current-version}"
description: ''
name: MCP_VERSION
trim: 'false'
@@ -72,23 +72,23 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{current-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{current-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -173,7 +173,7 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
@@ -183,12 +183,12 @@
name: TEMPEST_PATTERN
trim: 'false'
- string:
- default: 'refs/tags/2019.2.9'
+ default: refs/tags/{current-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{current-version}"
description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index dbb8f1d..feab620 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -33,7 +33,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.0
+ default: "{previous-version}"
description: ''
name: MCP_VERSION
trim: 'false'
@@ -63,30 +63,30 @@
name: ENV_NAME
trim: 'false'
- string:
- default: refs/heads/2019.2.0
+ default: refs/tags/{previous-version}
description: |-
Example: refs/changes/89/411189/36
(for now - only one reference allowed)
name: TCP_QA_REFS
trim: 'false'
- string:
- default: refs/heads/release/2019.2.0
+ default: refs/tags/{previous-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: refs/heads/release/2019.2.0
+ default: refs/tags/{previous-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: 2019.2.0
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: 2019.2.0
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -108,7 +108,7 @@
name: COOKIECUTTER_REF_CHANGE
trim: 'false'
- string:
- default: refs/heads/2019.2.0
+ default: refs/tags/{previous-version}
description: ''
name: ENVIRONMENT_TEMPLATE_REF_CHANGE
trim: 'false'
@@ -161,12 +161,12 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: refs/heads/release/2019.2.0
+ default: refs/tags/{previous-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
- string:
- default: refs/heads/release/2019.2.0
+ default: refs/tags/{previous-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index dd5ccdc..f0a342a 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -33,7 +33,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: ''
name: MCP_VERSION
trim: 'false'
@@ -70,23 +70,23 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -189,17 +189,17 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index 79fec53..9c5f6aa 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -33,7 +33,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: ''
name: MCP_VERSION
trim: 'false'
@@ -70,23 +70,23 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -188,7 +188,7 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
@@ -198,12 +198,12 @@
name: TEMPEST_PATTERN
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 14064bf..4e394a9 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -33,7 +33,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: ''
name: MCP_VERSION
trim: 'false'
@@ -70,22 +70,22 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}} value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}} value
name: SALT_MODELS_SYSTEM_COMMIT
trim: 'false'
@@ -186,17 +186,17 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index d6fab2a..b39a716 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -33,7 +33,7 @@
name: PLATFORM_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: ''
name: MCP_VERSION
trim: 'false'
@@ -70,23 +70,23 @@
name: TCP_QA_REFS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in pipeline-library
name: PIPELINE_LIBRARY_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: reference to patchset in mk-pipelines
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -188,7 +188,7 @@
name: LAB_PARAM_DEFAULTS
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: JENKINS_PIPELINE_BRANCH
trim: 'false'
@@ -198,12 +198,12 @@
name: TEMPEST_PATTERN
trim: 'false'
- string:
- default: refs/tags/2019.2.9
+ default: refs/tags/{previous-version}
description: ''
name: MCP_COMMON_SCRIPTS_REFS
trim: 'false'
- string:
- default: 2019.2.9
+ default: "{previous-version}"
description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'