X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy.yaml;h=3e2d0e76456b6e1e6c22bc6735141068463085b9;hb=67c1e0ed44ade0154d03b65ed7483d7f68731918;hp=a89c03329bc64ee17874a73ceffa95e44f9f3b2a;hpb=89f3dafca52af8a99ed565abf4b5e4cdd64c788f;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index a89c03329..3e2d0e764 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.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: 'groupbasedpolicy'
@@ -17,8 +16,9 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
@@ -36,8 +36,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: 'groupbasedpolicy'
@@ -49,7 +48,7 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         openflowjava-merge-{stream},
@@ -68,8 +67,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: 'groupbasedpolicy'
@@ -82,7 +80,7 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         openflowjava-merge-{stream},
@@ -99,10 +97,10 @@
 - project:
     name: groupbasedpolicy-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'