X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fl2switch%2Fl2switch.yaml;h=4f14ebcbdb303423dd44d38dcf31fbde46ceae24;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=3792df73364a4a909e27c85f1bb1436048c046ab;hpb=9712aebd07d323d91d7e9f7f1392ae7768338644;p=releng%2Fbuilder.git

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 3792df7336..4f14ebcbdb 100644
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: l2switch-fluorine
+    name: l2switch-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'l2switch'
     project-name: 'l2switch'
     branch: 'master'
@@ -22,38 +22,14 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/oxygen'
-    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-nitrogen
+    name: l2switch-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/nitrogen'
+    branch: 'stable/fluorine'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -68,16 +44,15 @@
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-carbon
+    name: l2switch-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'l2switch'
     project-name: 'l2switch'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
@@ -100,3 +75,9 @@
     branch: 'master'
     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