CI: Add jobs for openjdk21 and mvn 3.9.x

OpenJDK21 is installed and built with Ubuntu 20.04 LTS onwards
therefore enable these jobs for testing with odlparent.

Change-Id: I280851d168191dd7e0620a8a9fa7ceb51d2b2630
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 767042b309ede5af0c4cd96cc31a1636dff4a942..92b2c8fd98601249ee8b450a0e58fad7718a5e8b 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -32,6 +32,39 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
+- project:
+    name: odlparent-master-jdk21
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: ubuntu2004-docker-4c-4g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odlparent
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
+          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent-jdk21
+    stream: master
+    branch: master
+
+    mvn-settings: odlparent-settings
+
+    dependencies: ""
+    email-upstream: "[odlparent]"
+    archive-artifacts: >
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-12.0.x
     jobs:

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 046b7ff747082c7d3d1f3cb8fc56f4079998d4e7..e422f52690ff926ffcb7e197419a1d2af7da9858 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -48,6 +48,31 @@
     java-version: openjdk17
     mvn-version: mvn38
 
+- job-group:
+    name: odl-maven-jobs-jdk21
+
+    jobs:
+      - gerrit-maven-clm:
+          nexus-iq-namespace: odl-
+          nexus-iq-stage: release
+          mvn-opts: "--add-opens java.base/java.util=ALL-UNNAMED"
+
+      - gerrit-maven-merge:
+          build-timeout: 180
+
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          cron: ""
+
+      - gerrit-maven-mri-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          cron: ""
+
+    java-version: openjdk21
+    mvn-version: mvn39
+
 - job-group:
     name: odl-maven-verify-jobs
 
@@ -69,6 +94,17 @@
     java-version: openjdk17
     mvn-version: mvn38
 
+- job-group:
+    name: odl-maven-verify-jobs-jdk21
+
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
+    java-version: openjdk21
+    mvn-version: mvn39
+
 - job-group:
     name: odl-sonar-jobs-jdk17
 
@@ -83,6 +119,20 @@
     sonarcloud-api-token: "{sonarcloud_api_token}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
+- job-group:
+    name: odl-sonar-jobs-jdk21
+
+    jobs:
+      - gerrit-maven-sonar
+
+    java-version: openjdk21
+    mvn-version: mvn39
+    sonarcloud: true
+    sonarcloud-java-version: openjdk21
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+
 - job-template:
     name: "{project-name}-integration-{stream}"