X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron.yaml;h=855b2bdc413ebbc397a448b8090cea1bf24a889c;hb=6a24f27064a0026de272507a2449dcea38280692;hp=4f44276fe95d323933628be23f36b4d6db825fa6;hpb=6e54d42d5a08f4bf66f0203f37acfc841e7e8f85;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 4f44276fe..855b2bdc4 100644
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,21 +1,20 @@
 ---
 - 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-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - gerrit-maven-verify-dependencies
 
-    stream: nitrogen
+    stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -29,22 +28,20 @@
     archive-artifacts: ''
 
 - project:
-    name: neutron-carbon
+    name: neutron-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{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:
@@ -58,49 +55,21 @@
     archive-artifacts: ''
 
 - project:
-    name: neutron-boron
-    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}'
-
-    stream: boron
-    project: 'neutron'
-    project-name: 'neutron'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
-
-- project:
-    name: neutron-beryllium
+    name: neutron-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/beryllium'
+    build-timeout: 60
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven: