Merge "Update Ubuntu 14.04 image"

[releng/builder.git] / jjb / sfc / sfc.yaml

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index db26acad7df18c5c282953648f40384a8a850411..75d1bd250bbc7cb8e528111496c63e920588bab2 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,71 +1,59 @@
 ---
 - 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'
-    jdks:
-      - openjdk8
     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]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    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}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
+    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]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    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}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
+    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]'
-    archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a