Merge "Set JDK11 for all magnesium build jobs"

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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 8d7b6f57e9549a307a1bdc459766910b2f577b57..fbcc00bb268a6f73fd16a1cdccfc08c67300230c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -10,7 +10,8 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
@@ -21,9 +22,10 @@
     branch: 'master'
     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 -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -46,6 +48,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
@@ -58,7 +61,7 @@
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -81,6 +84,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
@@ -93,39 +97,7 @@
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    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-fluorine
-    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
-
-    stream: fluorine
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/fluorine'
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -146,9 +118,10 @@
     branch: 'master'
     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 -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: openflowplugin-view