Update sonar jobs to global-jjb

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

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index dc0d3392d0012e3d19aa949b736323dff8adc6da..f41693c9f171f8b5a66133e2f8528c0f6c17d52c 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -1,18 +1,16 @@
 ---
 - project:
-    name: next-nitrogen
+    name: next-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'next'
     project-name: 'next'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,22 +23,21 @@
     email-upstream: '[next]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
 - project:
-    name: next-carbon
+    name: next-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'next'
     project-name: 'next'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -53,22 +50,22 @@
     email-upstream: '[next]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e7c516f385
+
 - project:
-    name: next-boron
+    name: next-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'next'
     project-name: 'next'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -81,10 +78,13 @@
     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'