Update Java version & build node for Sonar jobs

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

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 25598d58fdd437eed00b627428d4f68a74149e5d..33385c4ba045a7055e3fd2786cdcfc48df8e8656 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,54 +1,23 @@
 ---
 - project:
-    name: lispflowmapping-phosphorus
+    name: lispflowmapping-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: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: phosphorus
+    stream: chlorine
     project: "lispflowmapping"
     project-name: "lispflowmapping"
     branch: "master"
-    java-version: "openjdk11"
-    mvn-settings: "lispflowmapping-settings"
-    mvn-goals: "clean deploy -DrepoBuild"
-    mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
-    dependencies: "controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}"
-    email-upstream: "[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]"
-    archive-artifacts: >
-      **/*.log
-      **/target/surefire-reports/*-output.txt
-
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
-- project:
-    name: lispflowmapping-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: lispflowmapping
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
-          rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "lispflowmapping"
-    project-name: "lispflowmapping"
-    branch: "stable/silicon"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
@@ -58,16 +27,17 @@
       **/*.log
       **/target/surefire-reports/*-output.txt
 
-    build-node: centos7-builder-8c-8g
+    build-node: centos8-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-aluminium
+    name: lispflowmapping-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: lispflowmapping
@@ -75,11 +45,12 @@
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
-    stream: aluminium
+    stream: sulfur
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "stable/aluminium"
+    branch: "stable/sulfur"
     java-version: "openjdk11"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"
@@ -90,13 +61,13 @@
       **/*.log
       **/target/surefire-reports/*-output.txt
 
-    build-node: centos7-builder-8c-8g
+    build-node: centos8-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
 - project:
-    name: lispflowmapping-magnesium
+    name: lispflowmapping-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -108,10 +79,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: phosphorus
     project: "lispflowmapping"
     project-name: "lispflowmapping"
-    branch: "stable/magnesium"
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"
@@ -134,9 +105,10 @@
     project: "lispflowmapping"
     project-name: "lispflowmapping"
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "lispflowmapping-settings"
-    mvn-goals: "clean deploy -DrepoBuild"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"