X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsfc%2Fsfc.yaml;h=75d1bd250bbc7cb8e528111496c63e920588bab2;hb=5977e805e57da4ce9877ac5e4a5d38db7fef5abd;hp=564a8861d8e4e3c11df8aee89bc5ee42e7f5aa6b;hpb=d2728da8c27b3fa350c24308ff364f2a469596c7;p=releng%2Fbuilder.git

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 564a8861d..75d1bd250 100644
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,82 +1,59 @@
 ---
 - project:
-    name: sfc-oxygen
+    name: sfc-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     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]'
-    archive-artifacts: ''
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-nitrogen
+    name: sfc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     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]'
-    archive-artifacts: ''
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-carbon
+    name: sfc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     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]'
-    archive-artifacts: ''
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -89,5 +66,4 @@
     project-name: 'sfc'
     branch: 'master'
     mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'