X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron.yaml;h=3f3de316aeb5e33e23946ae2411fe65dda34206f;hb=7d16ac5800cc99d4b31f8a4a8070be9c6407e167;hp=8d0548052fba702f9f9af7fb9fa414d24b05f033;hpb=482eb559cce738749ed152a72bd28b279e4c7edf;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 8d0548052..3f3de316a 100644
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -4,14 +4,13 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
+    build-timeout: 90
     branch: 'master'
     jdks:
       - openjdk8
@@ -33,9 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'neutron'
@@ -62,9 +60,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'neutron'
@@ -90,7 +87,7 @@
 - project:
     name: neutron-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'