Update Java version & build node for Sonar jobs

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

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index b80437336534b17e1f49cb0ba86c0bad62e477dc..89eb1154a05ffabe888f24fbb05aaa8926904ac7 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -2,53 +2,57 @@
 - project:
     name: bgpcep-master
     jobs:
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - gerrit-tox-verify:
+          parallel: true
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     stream: master
     project: "bgpcep"
     project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
     build-timeout: 120
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-8c-8g
+    java-version: "openjdk17"
     mvn-settings: "bgpcep-settings"
-    mvn-opts: "-Xmx2048m"
     dependencies: >
       odlparent-merge-{stream},
       yangtools-merge-{stream},
       controller-merge-{stream},
       mdsal-merge-{stream}
     email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-
     # Used by the release job
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-silicon
+    name: bgpcep-0.17.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: bgpcep
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/
           rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc
+      - gerrit-tox-verify:
+          parallel: true
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-8c-8g
 
-    stream: silicon
+    stream: 0.17.x
     project: "bgpcep"
     project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/silicon"
+    branch: 0.17.x
     java-version: "openjdk11"
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx2048m"
@@ -58,14 +62,12 @@
       controller-merge-{stream},
       mdsal-merge-{stream}
     email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-
     # Used by the release job
     staging-profile-id: 9427a05049030
 
 - project:
-    name: bgpcep-aluminium
+    name: bgpcep-0.16.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -75,12 +77,12 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 0.16.x
     project: "bgpcep"
     project-name: "bgpcep"
     build-node: centos7-builder-8c-8g
     build-timeout: 120
-    branch: "stable/aluminium"
+    branch: 0.16.x
     java-version: "openjdk11"
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx2048m"
@@ -90,7 +92,6 @@
       controller-merge-{stream},
       mdsal-merge-{stream}
     email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]"
-
     # Used by the release job
     staging-profile-id: 9427a05049030
 
@@ -104,6 +105,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: bgpcep-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: bgpcep-sonar
@@ -118,10 +122,11 @@
 
     project: "bgpcep"
     project-name: "bgpcep"
-    build-node: centos7-builder-8c-8g
+    build-node: centos8-builder-8c-8g
     build-timeout: 120
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "bgpcep-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true