Merge "Update multipatch script"

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index c55bb6ced91892e54a1b4f2906b885f60ce66b77..347e3f23a121d0e30b071dfe6c6b7272c8b8f4b7 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: l2switch-fluorine
+    name: l2switch-sodium
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
@@ -22,15 +22,36 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-oxygen
+    name: l2switch-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-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'
+    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-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'stable/fluorine'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -45,15 +66,15 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-nitrogen
+    name: l2switch-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -63,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,3 +98,9 @@
     branch: 'master'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+
+- project:
+    name: l2switch-view
+    views:
+      - project-view
+    project-name: l2switch