X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin.yaml;h=e82bc6b662bcee7c040df2d6c36f174e71fac9df;hb=7ea27cc20a9f252f4196db2ce52da4ef7c3b73cb;hp=588a41b5aa49039f2c0e2c03bc933ba705a99830;hpb=506ebeaa588eafd7c8685fa75269a7ff548b9191;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 588a41b5a..e82bc6b66 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -6,7 +6,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'openflowplugin'
@@ -20,6 +19,7 @@
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean install javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -38,7 +38,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'openflowplugin'
@@ -70,13 +69,12 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: carbon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
-    karaf-version: karaf3
+    karaf-version: 'karaf3'
     jdks:
       - openjdk8
     maven:
@@ -99,7 +97,7 @@
 - project:
     name: openflowplugin-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'