X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fsonar.yaml;h=47fba2d687428c07a65cab3a1977b0ac8251b07e;hb=refs%2Fchanges%2F24%2F41424%2F3;hp=e3dc14162b9c282798c1924bba7e449d427645ef;hpb=e28c08375343da89f009d702ab2df2f901e03086;p=releng%2Fbuilder.git

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index e3dc14162..47fba2d68 100644
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -18,15 +18,12 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: 'SONAR_BRANCH'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -34,19 +31,20 @@
             name: 'PROJECT_PATH'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{JENKINS_SETTINGS}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'JENKINS_SETTINGS'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS -B -Djenkins -Dsonar'
+        goals: 'MAVEN_GOALS -V -B -Djenkins -Dsonar'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{JENKINS_SETTINGS}'
-        global-settings: '{odl-global-settings}'
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -58,3 +56,5 @@
         - email-notification:
             email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'