X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffaas%2Ffaas.yaml;h=ea767f6e9ffeac6f7ba38acb4c1e6bbd1ee405c7;hb=8677c241183102bfef87c119de295c13fb2782e1;hp=ff2170e8f5af4493b047736fa3b4bc7fc9fdcec5;hpb=8c76f3dfcc549f8e959de1d3a52b3885d1cde4ce;p=releng%2Fbuilder.git

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index ff2170e8f..ea767f6e9 100644
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,67 +1,35 @@
 ---
 - project:
-    name: faas-oxygen
+    name: faas-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
-    jdks:
-      - openjdk8
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
-- project:
-    name: faas-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
 
 - project:
-    name: faas-carbon
+    name: faas-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'faas'
     project-name: 'faas'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
+    branch: 'stable/oxygen'
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858