Feat: switch default build-node to centos8-4c-4g

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index c0f7961f004c5d657eeb187b0b66912a7cf57490..8761d4281da7d1b213aa75651aecf00adcbb148a 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,7 +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"
@@ -26,21 +25,20 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-6.0.x
+    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
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    stream: 6.0.x
+    stream: 7.0.x
     project: "controller"
     project-name: "controller"
-    branch: 6.0.x
-    build-node: centos8-builder-4c-4g
+    branch: 7.0.x
     java-version: "openjdk17"
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pdocs"
@@ -52,26 +50,23 @@
     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
+          build-node: centos8-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
+    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]"
@@ -107,7 +102,6 @@
     project: "controller"
     project-name: "controller"
     branch: master
-    build-node: centos8-builder-4c-4g
     java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "controller-settings"