X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnext%2Fnext.yaml;h=7303620545f5abb5ae9a8ed6f6465dc35e561965;hb=b3d9042ef1e3c22e8b792ce01e9659d1cb683f1b;hp=e31e11ac8e8f87ee9fd9913948021868eac21d65;hpb=1d7cbf136d33cad96fa1520f4bba5fb2f1861447;p=releng%2Fbuilder.git

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index e31e11ac8..730362054 100644
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -1,27 +1,35 @@
 ---
+- project:
+    name: next-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    mvn-settings: 'next-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[next]'
+
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
 - project:
     name: next-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: 'next'
     project-name: 'next'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
@@ -30,25 +38,16 @@
     name: next-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: 'next'
     project-name: 'next'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
@@ -57,26 +56,17 @@
     name: next-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: 'next'
     project-name: 'next'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
@@ -84,10 +74,9 @@
 - project:
     name: next-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'next'
     project-name: 'next'
     branch: 'master'
-    mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+    mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'