Add JDK17 verify jobs for openflowplugin

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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index e924c905f5b3f8c416a35505ec8ac2cf60260614..a4478d62fd5869c4b77b81edb6db63298b29ae63 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -3,7 +3,8 @@
     name: openflowplugin-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
           doc-dir: .tox/docs/tmp/html
@@ -12,12 +13,13 @@
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
     stream: sulfur
     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"
     mvn-settings: "openflowplugin-settings"
@@ -96,39 +98,6 @@
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
-- project:
-    name: openflowplugin-aluminium
-    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: aluminium
-    project: "openflowplugin"
-    project-name: "openflowplugin"
-    branch: "stable/aluminium"
-    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: