Merge "Remove jdk11 job-groups"

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index a70d9931f370007d394a2c6be7843b8a9053276c..11e4686c5e27ee3555632ba52b9902a4aa64fd15 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,22 +3,21 @@
     name: controller-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos8-builder-2c-2g
+          build-node: ubuntu2004-docker-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
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
 
+    project: controller
+    project-name: controller
     stream: master
-    project: "controller"
-    project-name: "controller"
     branch: master
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
+    build-node: ubuntu2004-docker-4c-4g
+
     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]"
 
@@ -26,25 +25,26 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-7.0.x
+    name: controller-9.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos8-builder-2c-2g
+          build-node: ubuntu2004-docker-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
+      - odl-maven-verify-jobs-jdk21:
+          build-node: ubuntu2004-docker-4c-4g
+
+    project: controller
+    project-name: controller
+    stream: 9.0.x
+    branch: 9.0.x
 
-    stream: 7.0.x
-    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
+
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
 
@@ -52,7 +52,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-6.0.x
+    name: controller-8.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
@@ -62,15 +62,14 @@
       - 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"
+    project: controller
+    project-name: controller
+    stream: 8.0.x
+    branch: 8.0.x
+
     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]"
 
@@ -87,14 +86,11 @@
 
     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
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk21:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -102,19 +98,13 @@
             jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
             sonar:sonar
 
-    project: "controller"
-    project-name: "controller"
+    project: controller
+    project-name: controller
     branch: master
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
-    mvn-version: mvn38
+    build-node: ubuntu2004-docker-4c-4g
+
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pintegrationtests,docs"
-    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: controller-info