Merge "Switch the csit-verify-3node to use job prefix"

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 acf89cb58adc08cb830f0aa0a63cdc2a2de190a3..5e01210a39846aa87e6ad0205e20f356f6684f92 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}'
       - inttest-csit-1node
       - 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 80f2abea3ef07eea8a1abd91179982675dce4ceb..d651eef758b2c690fcb08508f75cc3e8c390e7ff 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -468,7 +468,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'