Switch the patch-test 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-patch-test 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: I2abf886229e496868841f76888fe38deba208301
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml
index b826a5e39021bd60d235668d67217e58d974ba1b..48a261785e6919b0da0ad39a09ff0992bf602789 100644 (file)
--- a/jjb/aaa/aaa-patch-test.yaml
+++ b/jjb/aaa/aaa-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: aaa-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'aaa'

diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml
index 1670dcd91b2abb3aedaf23c65d300ee1dfc4b49a..3c1f84b94a3f4176e2a2ea85fa01c93cf1ce5e10 100644 (file)
--- a/jjb/bgpcep/bgpcep-patch-test.yaml
+++ b/jjb/bgpcep/bgpcep-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'bgpcep'

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index 0bd622eb465c490a7703425921e94ccbf60cdd8c..50f22777a9443f6f9589a053042da81eb0bc586f 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: genius-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'genius'

diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml
index 2a819d4f1b53cfee05c0ee71e3ed5f196d170ebd..69eda5471b15bdf6ac3625153aab8efaca1926fa 100644 (file)
--- a/jjb/infrautils/infrautils-patch-test.yaml
+++ b/jjb/infrautils/infrautils-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: infrautils-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     project: 'infrautils'
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f96a41b93c1a9bf6e66840b912e271265bd009bd..489929b6e997f3d543c4ccc501eefac89bac2b97 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1415,7 +1415,8 @@
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
-    name: '{project}-patch-test-{feature}-{stream}'
+    name: '{prefix}{project}-patch-test-{feature}-{stream}'
+    id: inttest-patch-test
 
     project-type: freestyle
     node: centos7-builder-2c-8g

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index bee9bf7a379df57f8da75b0957888bf675795860..70beefc48c22f0ce220e987935cf36bd50f799db 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'l2switch'

diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml
index 74fcde32aba979042bc8b7b7a57e50e9d8f5c593..bd4263fe90b8640053de570a0837ee6d3274855b 100644 (file)
--- a/jjb/netconf/netconf-patch-test.yaml
+++ b/jjb/netconf/netconf-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netconf'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index e4b323e677a3ae41ac8b4641646b0bd550b40b80..e06bfba5440f347a193839e2fdbff46af576bf33 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'netvirt'

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 184a2ae1272c04fa3746a2ec759294b22d58ba81..bbf752fb894aba4a8b092a732e6511e8c3f119cf 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'openflowplugin'

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index ae1f2b693faa44d7b633d0a78805c55e7907d2e2..108fe5c431c2754f8a5dc0d7a7e19e85df777557 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ovsdb-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'ovsdb'

diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml
index df1ae61b57e7fa808f577cb88f03499ed4e0e253..dc9cf856a5d5c7f02a5780f1a9cbc721f810706d 100644 (file)
--- a/jjb/sfc/sfc-patch-test.yaml
+++ b/jjb/sfc/sfc-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sfc-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'sfc'

diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml
index 6e378e4a5eab445b43f146cf1dc2f310e515aa06..f1719f93bc8fb315412339133c211a5657773a9e 100644 (file)
--- a/jjb/vtn/vtn-patch-test.yaml
+++ b/jjb/vtn/vtn-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: vtn-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'vtn'