Change default values to release/tag/MCP_VERSION value for repos
Unbind ubuntu/foundation/vcp images from MCP_VERSION,
because no changes were in images during the last updates
jenkins_pipelines_branch in reclass doesn't relate to
REPOSITORY_SUITE variable from tcp-qa
Change-Id: I3d33047ed6d32ad60a0ea5064e5bb484aad904e5
Related-Prod:#PROD-34612(PROD:34612)
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 e13e7e4..44be7a1 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
@@ -38,12 +38,12 @@
name: MCP_VERSION
trim: 'false'
- string:
- default: jenkins-master-si
+ default: sre-team-infra
description: ''
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
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 9427ea4..7265aa4 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
@@ -43,7 +43,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
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 b9cdba1..bcfdbd7 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
@@ -43,7 +43,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/bm-cicd-pike-ovs-maas.yml b/jobs/templates/bm-cicd-pike-ovs-maas.yml
index 0c59df9..13a0a20 100644
--- a/jobs/templates/bm-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-pike-ovs-maas.yml
@@ -44,7 +44,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/bm-cicd-queens-ovs-maas.yml b/jobs/templates/bm-cicd-queens-ovs-maas.yml
index 61dd249..9f35ee7 100644
--- a/jobs/templates/bm-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-queens-ovs-maas.yml
@@ -43,7 +43,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml b/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
index fcfbfea..ff44cd3 100644
--- a/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
+++ b/jobs/templates/cookied-cicd-queens-dvr-sl-heat.yml
@@ -43,7 +43,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/deploy-released.yml b/jobs/templates/deploy-released.yml
index 4ddb1f4..969e21f 100644
--- a/jobs/templates/deploy-released.yml
+++ b/jobs/templates/deploy-released.yml
@@ -9,7 +9,7 @@
name: deploy-released
parameters:
- string:
- default: sre-qa-ci-eu
+ default: sre-qa-team-ci
description: ''
name: OS_CREDENTIALS
trim: 'false'
diff --git a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
index 2ea8bc5..69097ca 100644
--- a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
@@ -45,7 +45,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
index b2c53bc..833250d 100644
--- a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
@@ -46,7 +46,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index dad3390..2c911e6 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -50,7 +50,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: '/home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2'
+ default: '/home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2'
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index 99f03e4..6132cac 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -45,7 +45,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index 3c5ce0f..d632805 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -44,7 +44,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml b/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
index 1ec57b0..b0cfe1b 100644
--- a/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
@@ -43,7 +43,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index 6828da1..1adce4c 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -43,7 +43,7 @@
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
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 8fbed34..1965854 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -38,12 +38,12 @@
name: MCP_VERSION
trim: 'false'
- string:
- default: jenkins-master-si
+ default: sre-team-infra
description: ''
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
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 0eef0b2..9992972 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -38,12 +38,12 @@
name: MCP_VERSION
trim: 'false'
- string:
- default: jenkins-master-si
+ default: sre-team-infra
description: ''
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
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 bc012dd..6ddc03e 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -38,12 +38,12 @@
name: MCP_VERSION
trim: 'false'
- string:
- default: jenkins-master-si
+ default: sre-team-infra
description: ''
name: NODE_NAME
trim: 'false'
- string:
- default: /home/jenkins/images/ubuntu-16-04-x64-mcp${{MCP_VERSION}}.qcow2
+ default: /home/jenkins/images/ubuntu-16-04-x64-mcp2019.2.0.qcow2
description: ''
name: MCP_IMAGE_PATH1604
trim: 'false'