Update Java version & build node for Sonar jobs

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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 1f5bb68d6c8899493ab08ee66a8d91edddce48b9..64129a20906b2b7d9d94b0082fcef727f5e82168 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -8,18 +8,16 @@
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     project: "jsonrpc"
     project-name: "jsonrpc"
     stream: chlorine
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     branch: "master"
     mvn-settings: "jsonrpc-settings"
     build-node: centos8-builder-4c-4g
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
     email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
 
@@ -78,31 +76,6 @@
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: jsonrpc
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
-          rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "jsonrpc"
-    project-name: "jsonrpc"
-    stream: silicon
-    java-version: "openjdk11"
-    branch: "stable/silicon"
-    mvn-settings: "jsonrpc-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
-    email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
 - project:
     name: jsonrpc-release-management
     jobs:
@@ -121,8 +94,9 @@
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     branch: "master"
+    build-node: centos8-builder-4c-4g
     mvn-version: mvn38
     mvn-settings: "jsonrpc-settings"
     mvn-opts: "-Xmx1024m"