X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjob.yaml.template;h=bfb8ecb98448c9f7dec0fca6f2fcdb3aca0f4e7f;hb=b7782cf7724ce6d1cb5e2fc3b2efc5c351040caa;hp=8b3d1b32566d5c3f977b3c4f8db09d877016d92c;hpb=b9c658bace5d680c3da9a5762a7312937927d5dd;p=releng%2Fbuilder.git

diff --git a/jjb/job.yaml.template b/jjb/job.yaml.template
index 8b3d1b325..bfb8ecb98 100644
--- a/jjb/job.yaml.template
+++ b/jjb/job.yaml.template
@@ -10,15 +10,11 @@
         - 'PROJECT-merge-{stream}'
         - 'PROJECT-daily-{stream}'
         - 'PROJECT-integration-{stream}'
+        - 'PROJECT-sonar'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
+    STREAMS
     project: 'PROJECT'
     jdk: 'openjdk7'
 
@@ -40,6 +36,7 @@
 
     project-type: maven
     node: dynamic_verify
+    concurrent: true
     jdk: '{jdk}'
 
     logrotate:
@@ -61,6 +58,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -115,6 +113,7 @@
             choosing-strategy: 'default'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -172,6 +171,7 @@
             branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -189,10 +189,6 @@
     publishers:
         - email-notification:
             email-prefix: '[PROJECT]'
-        - sonar:
-            branch: '{stream}'
-            language: 'java'
-            maven-opts: 'MAVEN_OPTS'
 
 - job-template:
     name: 'PROJECT-integration-{stream}'
@@ -222,12 +218,13 @@
             project: '{project}'
 
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
     wrappers:
+        - build-timeout
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
@@ -247,3 +244,49 @@
     publishers:
         - email-notification:
             email-prefix: 'EMAIL_PREFIX'
+
+- job-template:
+    name: 'PROJECT-sonar'
+
+    project-type: maven
+    node: dynamic_verify
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '7'
+        numToKeep: '10'
+        artifactDaysToKeep: '1'
+        artifactNumToKeep: '1'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: 'SONAR_BRANCH'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: 'validate'
+        maven-opts: 'MAVEN_OPTS'
+        settings: '{PROJECT-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - sonar:
+            language: 'java'
+            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
+        - email-notification:
+            email-prefix: '[PROJECT]'