X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fsonar.yaml;h=06e9242e5f72b44efe28a9576b3cc79ef3312471;hb=711059a42858d5a6bed3cd0355f0c2e6ade1d2da;hp=d6f0d1139983fd0adada81f4f6a910e495be28bd;hpb=338853c1ce3b2ec304a2c6c545cbc6f98333f9ce;p=releng%2Fbuilder.git

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index d6f0d1139..06e9242e5 100644
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -1,9 +1,10 @@
 - job-template:
-    name: 'PROJECT-sonar'
+    name: 'PROJECT_SHORTNAME-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: '{jdk}'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -24,22 +25,29 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{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: '{mvn32}'
+        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
 
@@ -48,5 +56,5 @@
             language: 'java'
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report