Merge "Install odl-mdsal-trace in netvirt oxygen csit"

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

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index e6ef01382a8f47d266a43207dde04a7b5fa2a330..08ec7ea29fa2deb04957c8b2272d80a3d2edc53c 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,15 +1,32 @@
 ---
+- project:
+    name: faas-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    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-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'faas'
     project-name: 'faas'
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -22,7 +39,6 @@
     name: faas-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +57,6 @@
     name: faas-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon