X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffaas%2Ffaas.yaml;h=bf762128ab8c9aab115a1c2a6226952b06f254df;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=c01098b30185d68bd511cd74c01c014f0876592d;hpb=d20352852b5c91440b0416e9600230c3c9e9799d;p=releng%2Fbuilder.git

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