Update Java version & build node for Sonar jobs

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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 450053d5814722ced1b90a06caa2916d52620e07..25825d077063ac48ded8f26ee88902451af00343 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -11,8 +11,7 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     stream: chlorine
@@ -21,7 +20,7 @@
     branch: "master"
     build-node: centos8-builder-4c-4g
     build-timeout: 90
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "openflowplugin-settings"
     mvn-goals: "clean deploy javadoc:aggregate"
     dependencies: >
@@ -99,39 +98,6 @@
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-silicon
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: openflowplugin
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
-          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: silicon
-    project: "openflowplugin"
-    project-name: "openflowplugin"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    java-version: "openjdk11"
-    mvn-settings: "openflowplugin-settings"
-    mvn-goals: "clean deploy javadoc:aggregate"
-    mvn-opts: "-Xmx1024m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      openflowjava-merge-{stream}
-    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
-
 - project:
     name: openflowplugin-sonar
     jobs:
@@ -140,12 +106,11 @@
     project: "openflowplugin"
     project-name: "openflowplugin"
     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: "openflowplugin-settings"
-    mvn-goals: "clean deploy javadoc:aggregate"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"