commit c15267d6fd5f59dbd155d6825676c692262fca4f
author Konrad Windszus <kwin@apache.org> Mon Jun 20 18:29:33 2022 +0200
committer Konrad Windszus <kwin@apache.org> Mon Jun 20 18:32:30 2022 +0200
tree 0ac45e12f8c2f8e0ab86cb588b0276c0ecc3079c
parent 29716d18807c84a267e58c813ab02135c84ba95d

SLING-11400 enable jacoco with the main Maven build

vars/slingOsgiBundleBuild.groovy

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index 1b97856..c7b4488 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -142,14 +142,18 @@
     }
 
     def invocation = {
-        if ( isReferenceStage && goal == "deploy" && shouldDeploy ) {
-            String localRepoPath = "${env.WORKSPACE}/local-snapshots-dir"
-            // Make sure the directory is wiped.
-            dir(localRepoPath) {
-                deleteDir()
+        if ( isReferenceStage ) {
+            if ( goal == "deploy" && shouldDeploy ) {
+                String localRepoPath = "${env.WORKSPACE}/local-snapshots-dir"
+                // Make sure the directory is wiped.
+                dir(localRepoPath) {
+                    deleteDir()
+                }
+                // deploy to local directory (all artifacts from a reactor) 
+                additionalMavenParams = "${additionalMavenParams} -DaltDeploymentRepository=snapshot-repo::default::file:${localRepoPath}"
             }
-            // deploy to local directory (all artifacts from a reactor)
-            additionalMavenParams = "${additionalMavenParams} -DaltDeploymentRepository=snapshot-repo::default::file:${localRepoPath}"
+            // calculate coverage with jacoco (for subsequent evaluation by SonarQube)
+            additionalMavenParams = "${additionalMavenParams} -Pjacoco-report"
         }
         checkout scm
         withMaven(maven: globalConfig.mvnVersion, jdk: jenkinsJdkLabel,
@@ -204,7 +208,7 @@
     def isPrBuild = env.BRANCH_NAME.startsWith("PR-")
 
     // As we don't have the global SonarCloud conf for now, we can't use #withSonarQubeEnv so we need to set the following props manually
-    def sonarcloudParams="-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_${jobConfig.repoName} -Pjacoco-report -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco-merged/jacoco.xml ${jobConfig.sonarQubeAdditionalParams}"
+    def sonarcloudParams="-Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_${jobConfig.repoName} -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco-merged/jacoco.xml ${jobConfig.sonarQubeAdditionalParams}"
     if ( jobConfig.sonarQubeUseAdditionalMavenParams ) {
         sonarcloudParams="${sonarcloudParams} ${additionalMavenParams}"
     }