X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron.yaml;h=3f3de316aeb5e33e23946ae2411fe65dda34206f;hb=d7c3880fe4578a70a16e2237bb8be8a1742c0291;hp=da56b6ed0f147ca10035ffc8248b2b09be0f9ad4;hpb=6491c9083b067c067aaee529fd686a08e71a6ded;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index da56b6ed0..3f3de316a 100644
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,19 +1,17 @@
 ---
 - project:
-    name: neutron-nitrogen
+    name: neutron-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
+    build-timeout: 90
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,22 +24,22 @@
     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}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    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:
@@ -54,22 +52,23 @@
     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}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    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:
@@ -82,10 +81,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'