Switch the csit-3node to use job prefix

Idea to add a new variable "{prefix}" to job templates. This
variable is defined already in defaults.yaml.
The prefix should always be blank in production thus producing the
same existing job names we are all used to. The prefix can be used
locally to add a prefix to job names when pushing jobs to the
sandbox. For example a prefix of "abc-" will be added to the front
of the job name allowing sandbox testers to be able to push a job
to the sandbox with a unique prefix to not overwrite other testers.

Additionally add an id inttest-csit-3node to make the job
template more easy to maintain. Allows us to refactor the job
template name without having to update every single user of the
template every time as the id will always be the same.

Change-Id: I557e2030280fd3538d3a83fd1833b173cc45f489
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index a6ea709fe5933adab1fb944a9fe11f830c285e31..3d7a48cba3faa9a1e8180136d58c8177ba28c14d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 142bb18423205e21273e776ddbf68250426565ac..1e46d21c7d12fd162e15548ca79e4d5274f23747 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
       - inttest-csit-verify-3node
 
     # The project name

diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml
index 353fadb4806ed5e1ef2f7d113704fd74d40da619..93735f1526993f3fdc9b0bf6fd6bcc1985469b46 100644 (file)
--- a/jjb/controller/controller-csit-cs-chasing-leader.yaml
+++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-cluster-singleton-chasing-the-leader-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml
index 5e1baa3bd257090d81da8a27d74feff000a2147a..7ff4b538b9dad7bfd7d1c96d27602a40a819705d 100644 (file)
--- a/jjb/controller/controller-csit-cs-partnheal.yaml
+++ b/jjb/controller/controller-csit-cs-partnheal.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-cluster-singleton-partition-and-heal-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
index 226d14b99f01a9c9b8b19bfe42015cb27526022b..be7345a975d9d8fbd11c66d5b0ef8ad6ad8bc10e 100644 (file)
--- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-data-broker-explicit-leader-movement-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
index f6e79b740fc6157876a470065096a94d7b8efdc6..891294cc83829a92862ed44e5b3254f2472e25ad 100644 (file)
--- a/jjb/controller/controller-csit-drb-partnheal.yaml
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-rpc-broker-partition-and-heal-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
index 798248543380fa1cb13fa001e4988eae2ca4e1c1..8bd1f5a32deb1b8fb4f1ad3bf883b10d62d2c5c5 100644 (file)
--- a/jjb/controller/controller-csit-drb-precedence.yaml
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-dom-rpc-broker-precedence-longevity
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index 8eaebd644cb90ad265a7a46fab593646469d891f..efd98b37b1ace6c3686e208cd38e4c91631fe9da 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-rest-clust-cars-perf
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'

diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml
index a62726383b0ae172417ba9d19fb08b95a5ce2aa0..d90ccbb85e06b20b685079e986232f479cff64cf 100644 (file)
--- a/jjb/daexim/daexim-csit-clustering-basic.yaml
+++ b/jjb/daexim/daexim-csit-clustering-basic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: daexim-csit-clustering-basic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'daexim'

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 5e01210a39846aa87e6ad0205e20f356f6684f92..a78a197476880a80160c9ad4f7ccd01458898c16 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -2,8 +2,8 @@
 - project:
     name: genius-csit-genius
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - inttest-csit-1node
+      - inttest-csit-3node
       - inttest-csit-verify-1node
       - inttest-csit-verify-3node
 

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index af92ac1f9081cd3f41fccfe64c665c234608443d..90800ffea1a5f17e215e9b92fca0ddc72ed45811 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
 
     # The project name

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 266c7d8a7118f2287f2b370af160c5bf09b7edef..892e40ab9b4423d59a602f87e0617b718e807e11 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -560,7 +560,8 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node
     disabled: false
 
     project-type: freestyle

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
index 4328c4918de399d52ba6571451adadd18e38246e..d00618879781f6fe392583e33c1c6a960a33be96 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
@@ -2,8 +2,8 @@
 - project:
     name: lispflowmapping-csit-msmr
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - inttest-csit-1node
+      - inttest-csit-3node
       - inttest-csit-verify-1node
 
     # The project name

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index 65ab143da28dff59367f8f4970d8c26c49079882..b4a1caa7754977ee934e1a371ff556d6a5a97042 100644 (file)
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-cluster-stress
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 51c272d145ef9dcb504b406afd6412024acd94e0..8131b7613f4405ae1662511e2959de581904547b 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
index 4b09a8a0da89da3ed71aaf4f2e2a0405e677c7e8..387126dc3ea2be39296c64f385830a5c02d70b80 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering-bulkomatic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index 3c8aa03537f84cc360b032ae3905ba90671d877e..a6bd1362ba678aaf0f37e6d8bc386765be4cbde4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering-perf-bulkomatic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index b14b2d07ad51c78bb55e6be8227fc6f96e8175be..ec0df076cf3d58c91e7eb2ed7c666cb0b3aab90b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index f988313561c2ff1211a3f0efee9f4260bd5335ed..4f485070352aa045f2cb89e31f3d532ce7a55800 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ovsdb-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
       - inttest-csit-verify-3node
     # The project name
     project: 'ovsdb'

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 0798c705a9c15c544d903c725ef03585f08164ee..5f15d879beec0fd701dca5361fe94cb5a7a63092 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sfc-csit-rest-basic
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
 
     # The project name

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index 56ab4ddeb030f3b7e324ffb72723b20735c25d33..9c3efd1403c7763aaa83e52c73fbe1a5585d1f69 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -2,7 +2,7 @@
 - project:
     name: vtn-csit-3node-manager
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
       - inttest-csit-verify-3node
 
     # The project name