X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnext%2Fnext.yaml;h=42771d028ffdaf5307752f5500ff20724e7caa6e;hb=b4cf45c2f7b0f81a395a81f85718df294868429d;hp=e31e11ac8e8f87ee9fd9913948021868eac21d65;hpb=5f05271aa71e6cde768fb6f6529e5769c5bf38a6;p=releng%2Fbuilder.git

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index e31e11ac8..42771d028 100644
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -1,82 +1,35 @@
 ---
 - project:
-    name: next-oxygen
+    name: next-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'next'
     project-name: 'next'
     branch: 'master'
-    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-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    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
-
-- project:
-    name: next-carbon
+    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: carbon
+    stream: oxygen
     project: 'next'
     project-name: 'next'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    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
@@ -84,10 +37,15 @@
 - 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'
+
+- view:
+    name: next
+    description: 'List of next jobs'
+    regex: '^next-.*'
+    <<: *releng_view_common