aligned Jenkinsfile_multibranch_pipeline

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · May 9, 2022 · 5a8b68f · 5a8b68f
1 parent 2fa3bf0
commit 5a8b68f
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/java/Jenkinsfile_multibranch_pipeline b/java/Jenkinsfile_multibranch_pipeline
@@ -58,13 +58,21 @@ pipeline {
                     image "$DITTO_DOCKER_IMAGE_MAVEN_JDK_8"
                 }
             }
+            when {
+                expression {
+                    return !params.SKIP_SONAR_SCAN
+                }
+            }
             steps {
                 dir("$WORKSPACE/java") {
                     configFileProvider([configFile(fileId: 'mvn-bdc-settings', variable: 'MVN_SETTINGS')]) {
-                        withSonarQubeEnv(installationName: "$SONAR_QUBE_ENV", credentialsId: "$SONAR_QUBE_CREDENTIAL_NAME") {
-                            sh "mvn -s $MVN_SETTINGS --batch-mode --errors sonar:sonar -Dsonar.branch.name=${theBranch} " +
-                                    " -Drevision=${theVersion}" +
-                                    " -Dditto.version=${dittoVersion}"
+                        echo 'Sonar Scan'
+                        withSonarQubeEnv(installationName: "${env.SONAR_QUBE_ENV}", credentialsId: "$SONAR_QUBE_CREDENTIAL_NAME") {
+                            sh "mvn -s $MVN_SETTINGS --batch-mode --errors $SONAR_MAVEN_GOAL " +
+                                    "-Dsonar.host.url=$SONAR_HOST_URL " +
+                                    "-Dsonar.projectKey=org.eclipse.ditto:${theBranch} " +
+                                    "-Drevision=${theVersion} " +
+                                    "-Dditto.version=${dittoVersion} "
                         }
                     }
                 }