Switch the csit-verify-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-verify-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: I9257729a920e23c00434493796fe6fd14ff6bd8f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

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

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 30d368368018227972a002cae5528059fd0b87ca..8f6ba167658a3672aece962c11d25462afdb130d 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -5,7 +5,7 @@
       - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
       - inttest-csit-verify-1node
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-verify-3node
 
 
     # The project name

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f96a41b93c1a9bf6e66840b912e271265bd009bd..f9284469eebdc75d84fdcb2ca80423d8f4266507 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -466,7 +466,8 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-verify-3node-{functionality}'
+    name: '{prefix}{project}-csit-verify-3node-{functionality}'
+    id: inttest-csit-verify-3node
     disabled: false
 
     project-type: freestyle

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

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