Merge "Rename jdk to java-version"

[releng/builder.git] / jjb / bier / bier.yaml

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 3d7866013cdb63587382e904d6622ea080f228f6..4f007654a789cce4bec3720bc465735e69ce9c08 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -10,12 +10,8 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     build-timeout: 90
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -36,11 +32,7 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -61,12 +53,8 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -84,5 +72,6 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'