Merge "Use Java 17 for l2switch build"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 8405fbdad18df5dada916f5cc402f20094e60f13..f93d17ba11d2f58916efc4c181808e82865efc02 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -18,6 +18,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - builder - x86_64 - 20240306-105309.257
 * ZZCI - CentOS 7 - builder - x86_64 - 20240401-060133.417
 * ZZCI - CentOS 7 - builder - x86_64 - 20240501-060129.055
+* ZZCI - CentOS 7 - builder - x86_64 - 20240601-060133.511
 * ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511
 * ZZCI - CentOS 7 - devstack - x86_64 - 20220915-220248.057
 * ZZCI - CentOS 7 - devstack - x86_64 - 20221016-125752.520
@@ -29,6 +30,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack - x86_64 - 20240306-105306.072
 * ZZCI - CentOS 7 - devstack - x86_64 - 20240401-230144.262
 * ZZCI - CentOS 7 - devstack - x86_64 - 20240501-230129.155
+* ZZCI - CentOS 7 - devstack - x86_64 - 20240601-230133.464
 * ZZCI - CentOS 7 - devstack-rocky - 20190601-000116.015
 * ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
@@ -60,6 +62,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - docker - x86_64 - 20240306-105301.772
 * ZZCI - CentOS 7 - docker - x86_64 - 20240401-220152.097
 * ZZCI - CentOS 7 - docker - x86_64 - 20240501-220134.070
+* ZZCI - CentOS 7 - docker - x86_64 - 20240601-220142.195
 * ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
 * ZZCI - CentOS 7 - helm - x86_64 - 20220811-110654.568
 * ZZCI - CentOS 7 - helm - x86_64 - 20220915-220356.090
@@ -79,6 +82,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - robot - x86_64 - 20240306-105302.366
 * ZZCI - CentOS 7 - robot - x86_64 - 20240401-220244.081
 * ZZCI - CentOS 7 - robot - x86_64 - 20240501-220214.317
+* ZZCI - CentOS 7 - robot - x86_64 - 20240601-220241.858
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220303-223622.243
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220405-005246.199
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20220411-013651.819
@@ -102,6 +106,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20240309-064327.830
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20240401-160147.446
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20240501-160131.499
+* ZZCI - CentOS Stream 8 - builder - x86_64 - 20240601-160217.263
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20220811-231817.668
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20230301-010147.625
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20230401-010209.151
@@ -112,6 +117,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20240309-064350.911
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20240401-010224.970
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20240501-010211.041
+* ZZCI - CentOS Stream 8 - robot - x86_64 - 20240601-010231.803
 * ZZCI - OPNFV - apex - compute - 0
 * ZZCI - OPNFV - apex - compute - 1
 * ZZCI - OPNFV - apex - controller - 0
@@ -138,6 +144,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240306-000749.151
 * ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240326-112125.840
 * ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240501-040132.905
+* ZZCI - Ubuntu 18.04 - docker - x86_64 - 20240601-040134.455
 * ZZCI - Ubuntu 18.04 - helm -  - 20210513-214525.779
 * ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220501-140101.102
 * ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220811-112321.717
@@ -162,4 +169,5 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 20.04 - docker - x86_64 - 20240326-112013.773
 * ZZCI - Ubuntu 20.04 - docker - x86_64 - 20240401-160246.269
 * ZZCI - Ubuntu 20.04 - docker - x86_64 - 20240501-160207.164
+* ZZCI - Ubuntu 20.04 - docker - x86_64 - 20240601-160305.840
 * ZZCI - Ubuntu 22.04 - devstack - x86_64 - 20231031-095146.118

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 692c29090edd57c49fd9c9d6bde74f8251a907d5..df1c2b665e5bf3815efaedd6e1cee188633d79c6 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,20 +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: 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]"
 
@@ -24,23 +25,26 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-8.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
+
+    project: controller
+    project-name: controller
+    stream: 9.0.x
+    branch: 9.0.x
+    build-node: ubuntu2004-docker-4c-4g
 
-    stream: 8.0.x
-    project: "controller"
-    project-name: "controller"
-    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]"
 
@@ -48,7 +52,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-7.0.x
+    name: controller-8.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
@@ -58,13 +62,14 @@
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
-    stream: 7.0.x
-    project: "controller"
-    project-name: "controller"
-    branch: 7.0.x
+    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]"
 
@@ -81,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:
-      - odl-sonar-jobs-jdk17:
+      - odl-sonar-jobs-jdk21:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -96,12 +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: ubuntu2004-docker-4c-4g
+
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pintegrationtests,docs"
-    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
 
 - project:
     name: controller-info