X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsfc%2Fsfc.yaml;h=a38ec9b221c62265fbcc48d4e6c5d13433704c9a;hb=f93289b1fc422b77fcd00cfebe848c4eac982284;hp=42ccb2e4c8c3f097288f6b60ba7dc01926e82f6a;hpb=a68b5995953facb0129f37a9b83db5d68a538a80;p=releng%2Fbuilder.git

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 42ccb2e4c..a38ec9b22 100644
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -3,27 +3,18 @@
     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: oxygen
     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: 90
+    build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -32,26 +23,17 @@
     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: nitrogen
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/nitrogen'
-    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'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -60,27 +42,18 @@
     name: sfc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sfc'
     project-name: 'sfc'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    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'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -93,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'