Merge "Migrate docs-rtd to archive-builds macro"

[releng/builder.git] / jjb-templates / sonar.yaml

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index e3dc14162b9c282798c1924bba7e449d427645ef..4223ebd6883c4ee3f81142a0797c968889715352 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -13,20 +13,20 @@
         artifactNumToKeep: '1'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     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 +34,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 +59,5 @@
         - email-notification:
             email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'