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 d6f0d1139983fd0adada81f4f6a910e495be28bd..4223ebd6883c4ee3f81142a0797c968889715352 100644 (file)
--- 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'
@@ -12,33 +13,41 @@
         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:
-            user: '{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:
+        - 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 -V -B -Djenkins -Dsonar'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
-        global-settings: '{odl-global-settings}'
-
-    postbuilders:
-        - jacoco-nojava-workaround
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -48,5 +57,7 @@
             language: 'java'
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'