tests/ci: fix sonarqube analysis for main branch
Only use the branch options if it's actually running in a branch and analyse main without them, sonarqube otherwise doesn't recognize the main branch.
This commit is contained in:
parent
ee46f89647
commit
860a9bb49f
1 changed files with 8 additions and 7 deletions
|
|
@ -10,14 +10,15 @@ curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scan
|
|||
unzip -q sonar-scanner-cli.zip
|
||||
|
||||
SONAR_SCANNER_CMD="sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux/bin/sonar-scanner"
|
||||
SCANNER_OPTS="-Dsonar.projectKey=osbuild:osbuild -Dsonar.sources=. -Dsonar.host.url=https://sonarqube.corp.redhat.com -Dsonar.login=$SONAR_SCANNER_TOKEN"
|
||||
|
||||
$SONAR_SCANNER_CMD -Dsonar.projectKey=osbuild:osbuild \
|
||||
-Dsonar.sources=. \
|
||||
-Dsonar.host.url=https://sonarqube.corp.redhat.com \
|
||||
-Dsonar.login="$SONAR_SCANNER_TOKEN" \
|
||||
-Dsonar.pullrequest.branch="$CI_COMMIT_BRANCH" \
|
||||
-Dsonar.pullrequest.key="$CI_COMMIT_SHA" \
|
||||
-Dsonar.pullrequest.base="main"
|
||||
# add options for branch analysis if not running on main
|
||||
if [ "$CI_COMMIT_BRANCH" != "main" ];then
|
||||
SCANNER_OPTS="$SCANNER_OPTS -Dsonar.pullrequest.branch=$CI_COMMIT_BRANCH -Dsonar.pullrequest.key=$CI_COMMIT_SHA -Dsonar.pullrequest.base=main"
|
||||
fi
|
||||
|
||||
# run the sonar-scanner
|
||||
eval "$SONAR_SCANNER_CMD $SCANNER_OPTS"
|
||||
|
||||
SONARQUBE_URL="https://sonarqube.corp.redhat.com/dashboard?id=osbuild%3Aosbuild&pullRequest=$CI_COMMIT_SHA"
|
||||
# Report back to GitHub
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue