Switch the csit-3node-periodic 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-periodic 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: I732dd5120b2005c5e975f68f7d99a98c1203ebe5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

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

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

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index eba3e225860e1ae99277b0bd34209f85b5a7166a..f308a1632ec982b5da0a0277a70b0f65da719be0 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-periodic-dsbenchmark-cluster
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'controller'

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

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

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index 94490090882879afc5450584e9da9b6899e896b0..9474a4097e6fa26fe946aa5260941fe2dbdd5a1d 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-routing
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'sxp'

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