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 6cdaf1ef9fbabd4dc62621585337a79793451c8b..c0f7961f004c5d657eeb187b0b66912a7cf57490 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -7,18 +7,17 @@
           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
+    build-node: centos8-builder-4c-4g
+    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,9 +26,34 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-magnesium
+    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-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    stream: 6.0.x
+    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
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
+
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
+- project:
+    name: controller-5.0.x
     jobs:
-      - "{project-name}-distribution-check-{stream}":
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: controller
@@ -37,16 +61,17 @@
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-4c-4g
 
-    stream: magnesium
+    stream: 5.0.x
     project: "controller"
     project-name: "controller"
-    branch: "stable/magnesium"
+    branch: 5.0.x
     java-version: "openjdk11"
     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"
+    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]"
@@ -64,6 +89,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
@@ -71,12 +99,17 @@
       - 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"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pintegrationtests,docs"
     mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"