Update Java version & build node for Sonar jobs

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 094b331fcecf8cf2b2f2b2ab7bf749255cc4e952..6d7a12d38d0fad8dc5d27b0f96cee57c8f9bc562 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,23 +1,24 @@
 ---
 - project:
-    name: ovsdb-sulfur
+    name: ovsdb-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: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: sulfur
+    stream: chlorine
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
-    build-node: centos7-builder-4c-4g
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-settings: "ovsdb-settings"
     dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
@@ -26,10 +27,11 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-phosphorus
+    name: ovsdb-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: ovsdb
@@ -38,10 +40,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/phosphorus"
+    branch: "stable/sulfur"
     build-node: centos7-builder-4c-4g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
@@ -52,34 +54,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: ovsdb
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
-          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "ovsdb"
-    project-name: "ovsdb"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
-    java-version: "openjdk11"
-    mvn-settings: "ovsdb-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
-
-- project:
-    name: ovsdb-aluminium
+    name: ovsdb-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -91,14 +66,13 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: phosphorus
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
+    branch: "stable/phosphorus"
+    build-node: centos7-builder-4c-4g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
 
@@ -113,11 +87,11 @@
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
-    build-node: centos7-builder-4c-4g
+    build-node: centos8-builder-4c-4g
     build-timeout: 90
-    java-version: "openjdk11"
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "ovsdb-settings"
-    mvn-goals: "clean deploy javadoc:aggregate"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"