X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fsonar.yaml;h=c17ba14cfad1b9bea2dc83086dc3d4754785fb95;hb=7365c119f2d01195da6a1877b106847be000e01a;hp=e80d97dfbbc4168db40ecac5ba67471998f7cfea;hpb=b633ecc9023d0d866fc4194af90e51720d9cd6c8;p=releng%2Fbuilder.git

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index e80d97dfb..c17ba14cf 100644
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-sonar'
+    name: 'PROJECT_SHORTNAME-sonar'
 
     project-type: maven
     node: dynamic_verify
@@ -28,19 +28,25 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
+        - gerrit-trigger-patch-sonar:
+            name: 'PROJECT_PATH'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS -Dsonar'
+        goals: 'MAVEN_GOALS -Djenkins -Dsonar'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
-
     reporters:
         - findbugs
 
@@ -49,5 +55,5 @@
             language: 'java'
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report