X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fsonar.yaml;h=afcfe9a3a95884d5032aff8c917dcde456237845;hb=4a8ab2252b467c8901178c58f1e8b498fcc6ced6;hp=d7bdaf57b4a837fc52efbd84dd38ed58110e4faa;hpb=622bb07eb5b4673333ee9891b4326382103bb307;p=releng%2Fbuilder.git

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index d7bdaf57b..afcfe9a3a 100644
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -1,9 +1,9 @@
 - job-template:
-    name: 'PROJECT-sonar'
+    name: 'PROJECT_SHORTNAME-sonar'
 
     project-type: maven
     node: dynamic_verify
-    jdk: '{jdk}'
+    jdk: 'openjdk7'
 
     logrotate:
         daysToKeep: '7'
@@ -29,18 +29,24 @@
 
     triggers:
         - timed: 'H H * * *'
+        - 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: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
         goals: 'MAVEN_GOALS -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