X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf.yaml;h=806cd5ee7ec880ddcfbd9106ee89a3f734bf785e;hb=f5dec3a1314025a15de3e5062ea5ab63d81fb34f;hp=197c84126a41f28fcba52a9ceab5e79baf8e4a00;hpb=b607d6db5ce8f810b61b4c3bf398f51c938765b2;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 197c84126..806cd5ee7 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netconf'
@@ -19,6 +18,7 @@
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
@@ -31,8 +31,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netconf'
@@ -58,8 +57,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netconf'
@@ -84,7 +82,7 @@
 - project:
     name: netconf-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'