CI: Add jobs for openjdk21 and mvn 3.9.x

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 03baaf7f2933f5fffe98ea67ef1b2bf41524ab26..92b2c8fd98601249ee8b450a0e58fad7718a5e8b 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -3,13 +3,13 @@
     name: odlparent-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           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-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
       - gerrit-tox-verify
 
     project: odlparent
@@ -17,9 +17,7 @@
     stream: master
     branch: master
 
-    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -35,61 +33,24 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-8.1.x
+    name: odlparent-master-jdk21
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          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-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21
       - gerrit-tox-verify
 
     project: odlparent
-    project-name: odlparent
-    stream: 8.1.x
-    branch: 8.1.x
-
-    java-version: "openjdk11"
-    mvn-settings: odlparent-settings
-    mvn-version: mvn36
-
-    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-7.0.x
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          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-jdk11
-      - odl-maven-verify-jobs
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 7.0.x
-    branch: 7.0.x
+    project-name: odlparent-jdk21
+    stream: master
+    branch: master
 
-    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -105,27 +66,24 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-6.0.x
+    name: odlparent-12.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           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-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
       - gerrit-tox-verify
 
+    stream: 12.0.x
     project: odlparent
     project-name: odlparent
-    stream: 6.0.x
-    branch: 6.0.x
+    branch: 12.0.x
 
-    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn35
 
     dependencies: ""
     email-upstream: "[odlparent]"
@@ -154,7 +112,7 @@
 - project:
     name: odlparent-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk17:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -165,13 +123,8 @@
     project: "odlparent"
     project-name: "odlparent"
     branch: "master"
-    java-version: "openjdk11"
     mvn-settings: "odlparent-settings"
     mvn-opts: "-Xmx1024m"
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: odlparent-info