X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcapwap%2Fcapwap.yaml;h=3ecfeb5f1d20b904ce10d75ee8cf67494200764c;hb=ea700e6ce859ac1a94294d77675a6ef214f0140a;hp=6836282e64f10e698886b6d41afc4c0e6d026093;hpb=c792dd0bbcd7293ac7097d12a5170e7f69369a68;p=releng%2Fbuilder.git

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 6836282e6..3ecfeb5f1 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: capwap-fluorine
+    name: capwap-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
@@ -18,33 +17,14 @@
     staging-profile-id: 96bd6b5bf86e3
 
 - project:
-    name: capwap-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/oxygen'
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
-- project:
-    name: capwap-nitrogen
+    name: capwap-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/nitrogen'
+    branch: 'stable/fluorine'
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -54,16 +34,15 @@
     staging-profile-id: 96bd6b5bf86e3
 
 - project:
-    name: capwap-carbon
+    name: capwap-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -82,3 +61,9 @@
     branch: master
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: capwap
+    description: 'List of capwap jobs'
+    regex: '^capwap-.*'
+    <<: *releng_view_common