X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fl2switch%2Fl2switch.yaml;h=1253ed55267ef70ea8fef7c168df4570d5048210;hb=2be5a4fb6ae1de3f36dacf59a90d4ece73c671f9;hp=347e3f23a121d0e30b071dfe6c6b7272c8b8f4b7;hpb=7d48177bafbb4c3beb042da423f77bfbc912364c;p=releng%2Fbuilder.git

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 347e3f23a..1253ed552 100644
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,37 +1,17 @@
 ---
 - project:
-    name: l2switch-sodium
+    name: l2switch-magnesium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
     mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
-- project:
-    name: l2switch-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'l2switch'
-    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},
@@ -39,21 +19,23 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-fluorine
+    name: l2switch-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/fluorine'
+    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},
@@ -61,22 +43,23 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-oxygen
+    name: l2switch-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: neon
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/oxygen'
+    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},
@@ -97,7 +80,8 @@
     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:
     name: l2switch-view