Support openjdk11 in CSIT magnesium

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 32575d0313db371a73c4deff553684a0e1a7e5e8..173a66549def88f79ee90720937149587cfc72c9 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -2,6 +2,7 @@
 - project:
     name: l2switch-magnesium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
@@ -10,7 +11,7 @@
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -34,7 +35,7 @@
     project-name: 'l2switch'
     branch: 'stable/sodium'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -58,7 +59,7 @@
     project-name: 'l2switch'
     branch: 'stable/neon'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -82,7 +83,7 @@
     project-name: 'l2switch'
     branch: 'stable/fluorine'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -103,7 +104,7 @@
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     disable-job: true
 
 - project: