Update Java version & build node for Sonar jobs

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

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 9a9656900b6c0d2aaf6897584393ba9a1c2be92e..7bba04192cd5cc7209a432c20272c3b8210e2ec2 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,59 +1,26 @@
 ---
 - project:
-    name: serviceutils-phosphorus
+    name: serviceutils-chlorine
     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: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     branch: "master"
-    stream: phosphorus
-
-    project: "serviceutils"
-    project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
-    mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
-    build-timeout: 90
-    dependencies: >
-      controller-merge-{stream},
-      yangtools-merge-{stream},
-      odlparent-merge-{stream},
-      infrautils-merge-{stream}
-    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
-    # Used by the release job
-    staging-profile-id: 12cc4ba8bf01ba
-
-- project:
-    name: serviceutils-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: serviceutils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
-          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    branch: "stable/silicon"
-    stream: silicon
+    stream: chlorine
 
     project: "serviceutils"
     project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
-    java-version: "openjdk11"
+    build-node: centos8-builder-2c-2g
+    java-version: "openjdk17"
     mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
     build-timeout: 90
     dependencies: >
       controller-merge-{stream},
@@ -61,15 +28,15 @@
       odlparent-merge-{stream},
       infrautils-merge-{stream}
     email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-aluminium
+    name: serviceutils-sulfur
     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: serviceutils
@@ -77,13 +44,14 @@
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
-    branch: "stable/aluminium"
-    stream: aluminium
+    branch: "stable/sulfur"
+    stream: sulfur
 
     project: "serviceutils"
     project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
+    build-node: centos8-builder-2c-2g
     java-version: "openjdk11"
     mvn-settings: "serviceutils-settings"
     mvn-opts: "-Xmx1024m"
@@ -94,12 +62,11 @@
       odlparent-merge-{stream},
       infrautils-merge-{stream}
     email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-magnesium
+    name: serviceutils-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -111,8 +78,8 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    branch: "stable/magnesium"
-    stream: magnesium
+    branch: "stable/phosphorus"
+    stream: phosphorus
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -127,7 +94,6 @@
       odlparent-merge-{stream},
       infrautils-merge-{stream}
     email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
-
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
@@ -139,8 +105,9 @@
     project: "serviceutils"
     project-name: "serviceutils"
     branch: "master"
-    build-node: centos7-builder-4c-4g
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "serviceutils-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true