Merge "Find karaf.log in NODE_FOLDER"

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

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 2c32dfe76eb87b053abf885cd601ec3e3eb954f7..660bb8b069bead147452d2d0f62f7a64b32cb5ba 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,48 +1,19 @@
 ---
 - 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}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
-    stream: nitrogen
+    stream: oxygen
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
-    jdk: openjdk8
-    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: ''
-
-- project:
-    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}'
-
-    stream: carbon
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -56,21 +27,18 @@
     archive-artifacts: ''
 
 - project:
-    name: sfc-boron
+    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}'
 
-    stream: boron
+    stream: nitrogen
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -84,23 +52,20 @@
     archive-artifacts: ''
 
 - project:
-    name: sfc-beryllium
+    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}'
 
-    stream: beryllium
+    stream: carbon
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk7
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: