Merge "Make autorelease & unimgr use java-builder-4c-16g"

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 8b9b1298cae36d2ae2ccf1180600bb91453a9d32..ad524858130d61f3a21dfbcceb884c6c3986316e 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -16,7 +16,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-autorelease-4c-16g
+    node: centos7-java-builder-4c-16g
     jdk: '{java-version}'
     cron: 'H 0 * * *'
 
@@ -212,7 +212,7 @@
 - job-template:
     name: autorelease-version-bump-{stream}
     project-type: freestyle
-    node: centos7-autorelease-4c-16g
+    node: centos7-java-builder-4c-16g
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 630a5b8eab4b5f066547f8f555b171b46a096ff8..9eaae4f43670e7913febafc23a1cd092eddd21a8 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -22,6 +22,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
+    build-node: centos7-java-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
@@ -49,6 +50,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
+    build-node: centos7-java-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
@@ -77,6 +79,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
+    build-node: centos7-java-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51