X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsfc%2Fsfc.yaml;h=972f346a217eaf762da8cbfe1547e1ac909e8c18;hb=d7c3880fe4578a70a16e2237bb8be8a1742c0291;hp=4bb8b33d6b9c5d4e3795b359f414cd840436263f;hpb=39ad49f2436d89b0ad6a0645202c5269b30a9c69;p=releng%2Fbuilder.git

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 4bb8b33d6..972f346a2 100644
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,19 +1,15 @@
 ---
 - project:
-    name: sfc-nitrogen
+    name: sfc-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -22,26 +18,26 @@
     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-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-carbon
+    name: sfc-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -53,23 +49,23 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-boron
+    name: sfc-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -81,11 +77,15 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
+
+    # Used by the release job
+    staging-profile-id: a68eb361ca48a
 
 - project:
     name: sfc-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'