Merge "Fix workaround for salt api timeout"
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 51af147..2ed6e55 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
@@ -82,13 +82,13 @@
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: ''
+ default: refs/tags/2019.2.8
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: ''
+ default: refs/tags/2019.2.8
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -189,7 +189,7 @@
trim: 'false'
- string:
default: 2019.2.8
- description: ''
+ description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'
- bool:
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 e7f9752..855169c 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
@@ -82,13 +82,13 @@
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: ''
+ default: refs/tags/2019.2.8
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: ''
+ default: refs/tags/2019.2.8
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
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 c629557..0ef6280 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
@@ -82,13 +82,13 @@
name: MK_PIPELINES_REF
trim: 'false'
- string:
- default: ''
+ default: refs/tags/2019.2.8
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: COOKIECUTTER_TEMPLATE_COMMIT
trim: 'false'
- string:
- default: ''
+ default: refs/tags/2019.2.8
description: Can be 'master' or 'proposed'. If empty, then takes ${{MCP_VERSION}}
value
name: SALT_MODELS_SYSTEM_COMMIT
@@ -189,7 +189,7 @@
trim: 'false'
- string:
default: 2019.2.8
- description: ''
+ description: 'for formula repo http://mirror.mirantis.com/update/UPDATE_VERSION/salt-formulas/xenial'
name: UPDATE_VERSION
trim: 'false'
- string: