Update Java version & build node for Sonar jobs

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

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 852efcddd7307734539ff183b4235b1af5b8854b..3bcb29b004578195e33f8a4b9c2d2a89d6415bb9 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -8,18 +8,16 @@
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     project: "daexim"
     project-name: "daexim"
     stream: chlorine
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "daexim-settings"
     build-node: centos8-builder-4c-4g
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
 
@@ -78,31 +76,6 @@
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: daexim
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
-          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: "daexim"
-    project-name: "daexim"
-    stream: silicon
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "daexim-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
 - project:
     name: daexim-sonar
     jobs:
@@ -111,7 +84,8 @@
     project: "daexim"
     project-name: "daexim"
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-version: mvn38
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"