Merge "Update cloud image CentOS7 builder x86_64"

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 374197ef5ee5278713f2461f8fefa9099b6fb636..c0f7961f004c5d657eeb187b0b66912a7cf57490 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -26,26 +26,24 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-5.0.x
+    name: controller-6.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17:
-          build-node: centos8-builder-4c-4g
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: 5.0.x
+    stream: 6.0.x
     project: "controller"
     project-name: "controller"
-    branch: 5.0.x
-    java-version: "openjdk11"
+    branch: 6.0.x
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pdocs"
-    mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
     build-timeout: 90
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
@@ -54,7 +52,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-4.0.x
+    name: controller-5.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -63,14 +61,15 @@
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-4c-4g
 
-    stream: 4.0.x
+    stream: 5.0.x
     project: "controller"
     project-name: "controller"
-    branch: "4.0.x"
+    branch: 5.0.x
     java-version: "openjdk11"
     mvn-settings: "controller-settings"
-    mvn-version: mvn36
     mvn-goals: "clean deploy -Pdocs"
     mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
     build-timeout: 90