X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fsonar.yaml;h=e91292582615e2986527090048bdf17e44ee8126;hb=refs%2Fchanges%2F21%2F41421%2F1;hp=b5f2243d93e4a056a013a5275cc51fea55fa32ab;hpb=99aa1a6b7147c00e7110294165af14254650c1b1;p=releng%2Fbuilder.git

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index b5f2243d9..e91292582 100644
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -1,9 +1,10 @@
 - job-template:
     name: 'PROJECT_SHORTNAME-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -22,27 +23,29 @@
             branch: 'SONAR_BRANCH'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: 'H H * * 6'
         - 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 -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
@@ -54,3 +57,5 @@
         - email-notification:
             email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'