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 ae9c7a24e340d2de0f766475f6d6f428386d98ec..8761d4281da7d1b213aa75651aecf00adcbb148a 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,22 +3,20 @@
     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
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     stream: master
     project: "controller"
     project-name: "controller"
-    branch: "master"
-    java-version: "openjdk11"
+    branch: master
+    java-version: "openjdk17"
     mvn-settings: "controller-settings"
-    mvn-version: mvn36
     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]"
@@ -27,26 +25,23 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-magnesium
+    name: controller-7.0.x
     jobs:
-      - "{project-name}-distribution-check-{stream}":
       - "{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-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: magnesium
+    stream: 7.0.x
     project: "controller"
     project-name: "controller"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
+    branch: 7.0.x
+    java-version: "openjdk17"
     mvn-settings: "controller-settings"
-    mvn-goals: "clean deploy -Pintegrationtests,docs"
-    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
-    build-node: centos7-builder-8c-8g
+    mvn-goals: "clean deploy -Pdocs"
     build-timeout: 90
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
@@ -55,25 +50,23 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-sodium
+    name: controller-6.0.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{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
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: sodium
+    stream: 6.0.x
     project: "controller"
     project-name: "controller"
-    branch: "stable/sodium"
+    branch: 6.0.x
+    java-version: "openjdk17"
     mvn-settings: "controller-settings"
-    mvn-goals: "clean deploy -Pintegrationtests,docs"
-    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
-    build-node: centos7-builder-8c-8g
+    mvn-goals: "clean deploy -Pdocs"
     build-timeout: 90
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
@@ -91,6 +84,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: controller-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 120
 
 - project:
     name: controller-sonar
@@ -98,12 +94,16 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "controller"
     project-name: "controller"
     branch: master
-    java-version: "openjdk11"
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pintegrationtests,docs"
     mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"