Convert verify and merge nodes to use new build label

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

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 0171ddaa8010f6c138bf861b97e1ff676ed2fe43..e9f1b4921d9b9e225b9294a588ac5383a09c44a3 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -16,7 +16,7 @@
 
 - job-template:
     name: 'docs-merge-rtd-{stream}'
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -63,7 +63,7 @@
 
 - job-template:
     name: 'docs-verify-rtd-{stream}'
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index c1dd718f13d3a5f1e23cf89b97889b8a5a1cbc0b..b58714f6e96141e8de713d93583eea2dc4a95acb 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -74,7 +74,7 @@
 
 - job-template:
     name: builder-verify-python
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -248,7 +248,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 9af4dbccb0173401f5e7a11226b224d9dc854db0..6729cb6aecf1d5b5ef1df9178724210180e7047d 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -9,7 +9,7 @@
     name: '{name}-clm-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -69,7 +69,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -134,7 +134,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jdk}'
 
@@ -247,7 +247,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -315,7 +315,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -423,7 +423,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -478,7 +478,7 @@
     disabled: false
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     jdk: 'openjdk8'
 
     logrotate:
@@ -541,7 +541,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jdk}'
 
@@ -663,7 +663,7 @@
             type: slave
             name: nodes
             values:
-                - dynamic_verify
+                - centos7-java-builder-2c-8g
         - axis:
             type: jdk
             values: '{obj:jdks}'

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index edaef8b750ce779f01828b4ad654509c52209675..c6feeea14f11c20b2f97876c31518d4f6709b760 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -5,7 +5,7 @@
     # in Nexus.
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -67,7 +67,7 @@
     # Job template for publishing a p2 repo given a URL to a zipped p2repo.
 
     project-type: maven
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     parameters:
@@ -126,7 +126,7 @@
     #                the workspace.
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:
@@ -199,7 +199,7 @@
     # Template for ReadTheDocs triggering
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: false
 
     parameters:
@@ -244,7 +244,7 @@
     #     nodever:   version of node to install in virtualenv
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 97342786a3caf3ccd0203137a9fa1e1af158cc77..87788ca762e01debe4c9f538ea0953e7eaddd0e1 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -25,7 +25,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index 4df26fadcde06dce8e2d87db602058039bc9db5d..378943f99e5b4e44b02260ca58296c6d0018abb3 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -65,7 +65,7 @@
     name: 'yangtools-verify-{stream}-{maven}-{jdk}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jdk}'