Merge "Update multipatch script"

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 4f14ebcbdb303423dd44d38dcf31fbde46ceae24..347e3f23a121d0e30b071dfe6c6b7272c8b8f4b7 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: l2switch-sodium
+    jobs:
+      - odl-maven-jobs
+
+    stream: sodium
+    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:
@@ -7,7 +29,7 @@
     stream: neon
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'master'
+    branch: 'stable/neon'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -62,6 +84,7 @@
         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
@@ -76,8 +99,8 @@
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
 
-- view:
-    name: l2switch
-    description: 'List of l2switch jobs'
-    regex: '^l2switch-.*'
-    <<: *releng_view_common
+- project:
+    name: l2switch-view
+    views:
+      - project-view
+    project-name: l2switch