From 2f8ee9a60c25f70fb394b6c0ddc18316705739c2 Mon Sep 17 00:00:00 2001 From: Philippe DUL Date: Mon, 23 Nov 2020 17:16:08 +0100 Subject: [PATCH] [releng] Fix sonar on non pull requests Change-Id: Iad009e440aec540bbe3cb1631d2d6bbd192d760e Signed-off-by: Philippe DUL --- vars/sonar.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/sonar.groovy b/vars/sonar.groovy index b133819..7abb4fe 100644 --- a/vars/sonar.groovy +++ b/vars/sonar.groovy @@ -6,7 +6,7 @@ def runSonar(String sonarProjectKey, String githubRepository, String sonarLoginT def jacocoParameters = "-Dsonar.java.coveragePlugin=jacoco -Dsonar.core.codeCoveragePlugin=jacoco " def sonarCommon = "sonar:sonar -Dsonar.projectKey=${sonarProjectKey} -Dsonar.organization=eclipse -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONARCLOUD_TOKEN} -Dsonar.skipDesign=true -Dsonar.dynamic=reuseReports -Dsonar.java.source=${javaVersion} -Dsonar.scanner.force-deprecated-java-version=true " def sonarBranchAnalysis = "-Dsonar.branch.name=${BRANCH_NAME}" - def sonarPullRequestAnalysis = "-Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.repository=${githubRepository} -Dsonar.pullrequest.key=${CHANGE_ID} -Dsonar.pullrequest.branch=${CHANGE_BRANCH}" + def sonarPullRequestAnalysis = (github.isPullRequest() ? "-Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.repository=${githubRepository} -Dsonar.pullrequest.key=${CHANGE_ID} -Dsonar.pullrequest.branch=${CHANGE_BRANCH}" : "") def sonar = sonarCommon + jacocoParameters + (github.isPullRequest() ? sonarPullRequestAnalysis : sonarBranchAnalysis) sh "mvn ${sonar}" }