X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnext%2Fnext.yaml;h=c3025ee070b9966f4584a516c763c1cc0a96b11f;hb=4c321bd26bd5bc3294f330c0a257e77dc5aa7ef1;hp=e53c2bf50af6a4bf5463c52d2514c714e94a8769;hpb=f571cb39b33e760f2267691cf97d792d36848882;p=releng%2Fbuilder.git

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index e53c2bf50..c3025ee07 100644
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -1,95 +1,63 @@
+---
 - project:
-    name: next-carbon
+    name: next-fluorine
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{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: fluorine
     project: 'next'
     project-name: 'next'
     branch: 'master'
-    jdk: openjdk8
-    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
 
 - project:
-    name: next-boron
+    name: next-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{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}'
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: oxygen
     project: 'next'
     project-name: 'next'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    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
 
 - project:
-    name: next-beryllium
+    name: next-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{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}'
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: nitrogen
     project: 'next'
     project-name: 'next'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     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
 
 - 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'