Feat: switch default java-version to openjdk17

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 28b38ea038d9a7b0d6fde665d4909945f2b69804..c3f0cea1d997c6f82128e4ba004f6c1c0059f072 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,7 +3,7 @@
     name: controller-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
@@ -14,8 +14,6 @@
     project: "controller"
     project-name: "controller"
     branch: master
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pdocs"
     build-timeout: 90
@@ -29,7 +27,7 @@
     name: controller-7.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
@@ -40,8 +38,6 @@
     project: "controller"
     project-name: "controller"
     branch: 7.0.x
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pdocs"
     build-timeout: 90
@@ -55,7 +51,7 @@
     name: controller-6.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
@@ -66,8 +62,6 @@
     project: "controller"
     project-name: "controller"
     branch: 6.0.x
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pdocs"
     build-timeout: 90
@@ -105,8 +99,6 @@
     project: "controller"
     project-name: "controller"
     branch: master
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pintegrationtests,docs"