From ad5c8102c07f4f82547a18673d1e82b6c598ba56 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 23 Feb 2021 10:22:37 +0100 Subject: [PATCH] Reenable SonarQube analysis for pull requests (#1556) --- Jenkinsfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2ad2f79321..4a2346a073 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,9 +76,18 @@ pipeline { sh 'git fetch origin develop' script { withSonarQubeEnv('sonarcloud.io-scm') { - String parameters = " -Dsonar.organization=scm-manager -Dsonar.branch.name=${env.BRANCH_NAME}" - if (env.BRANCH_NAME != "develop") { - parameters += " -Dsonar.branch.target=develop" + String parameters = ' -Dsonar.organization=scm-manager' + if (env.CHANGE_ID) { + parameters += ' -Dsonar.pullrequest.provider=GitHub' + parameters += ' -Dsonar.pullrequest.github.repository=scm-manager/scm-manager' + parameters += " -Dsonar.pullrequest.key=${env.CHANGE_ID}" + parameters += " -Dsonar.pullrequest.branch=${env.CHANGE_BRANCH}" + parameters += " -Dsonar.pullrequest.base=${env.CHANGE_TARGET}" + } else { + parameters += " -Dsonar.branch.name=${env.BRANCH_NAME}" + if (env.BRANCH_NAME != "develop") { + parameters += " -Dsonar.branch.target=develop" + } } gradle "sonarqube ${parameters}" }