X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsfc%2Fsfc.yaml;h=cb3c8a874179eff0bcd8e68da8db70a7c70fc634;hb=refs%2Fchanges%2F76%2F71976%2F4;hp=a7cfe702a5d6b3b12433660fbd8b5f7467ac82db;hpb=45dda826d667777fa16b4e937bce5e736cdcfa3c;p=releng%2Fbuilder.git

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index a7cfe702a..cb3c8a874 100644
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,12 +1,11 @@
 ---
 - project:
-    name: sfc-oxygen
+    name: sfc-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
@@ -21,39 +20,18 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: a68eb361ca48a
-
-- project:
-    name: sfc-carbon
+    name: sfc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     build-node: centos7-builder-8c-8g