Update sonar jobs to global-jjb

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index e1547594ac78966fc38b9e0caf724ff70a563d3c..6e421f2f611fb41da6897892a05a2853c484bd39 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,21 +1,18 @@
 ---
 - project:
-    name: neutron-nitrogen
+    name: neutron-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -28,23 +25,23 @@
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
-    name: neutron-carbon
+    name: neutron-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -57,22 +54,24 @@
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
-    name: neutron-boron
+    name: neutron-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/boron'
+    build-timeout: 60
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -85,10 +84,13 @@
     email-upstream: '[neutron] [odlparent] [aaa]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
+
 - project:
     name: neutron-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'