Update java templates with variable {build-node}

Change-Id: I9497d4fe3e4072fe12c82682356c61b7f32a7f08
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 6729cb6aecf1d5b5ef1df9178724210180e7047d..6c70f7c729141fef0d9af210e9be2a9f59508dea 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: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -69,7 +69,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -134,7 +134,7 @@
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -247,7 +247,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -315,7 +315,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -423,7 +423,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -478,7 +478,7 @@
     disabled: false
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: 'openjdk8'
 
     logrotate:
@@ -541,7 +541,7 @@
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -663,7 +663,7 @@
             type: slave
             name: nodes
             values:
-                - centos7-java-builder-2c-8g
+                - '{build-node}'
         - axis:
             type: jdk
             values: '{obj:jdks}'

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index c6feeea14f11c20b2f97876c31518d4f6709b760..e5f611a2618658f6800606bea8eff07805eef8d6 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -5,7 +5,7 @@
     # in Nexus.
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     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: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jdk}'
 
     parameters:
@@ -126,7 +126,7 @@
     #                the workspace.
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     concurrent: true
 
     logrotate:
@@ -199,7 +199,7 @@
     # Template for ReadTheDocs triggering
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     concurrent: false
 
     parameters:
@@ -244,7 +244,7 @@
     #     nodever:   version of node to install in virtualenv
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     concurrent: true
 
     logrotate: