From 4584732a24739053dea0538f315bc5e6f6a18173 Mon Sep 17 00:00:00 2001 From: Francisco Schulz Date: Wed, 1 Feb 2023 16:27:00 +0100 Subject: [PATCH] update to scan `./src` --- .../src/main/resources/scripts/sonar-scan.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/sonar-scan.sh b/bamboo-specs/src/main/resources/scripts/sonar-scan.sh index c067cd4..48f7bb8 100755 --- a/bamboo-specs/src/main/resources/scripts/sonar-scan.sh +++ b/bamboo-specs/src/main/resources/scripts/sonar-scan.sh @@ -19,19 +19,21 @@ python3 -m pip install coverage # fi SERVICE_NAME=$1 +project_name="RED" +pkg_src="src" echo "dependency-check:aggregate" mkdir -p reports dependency-check --enableExperimental -f JSON -f HTML -f XML \ --disableAssembly -s . -o reports --project $SERVICE_NAME --exclude ".git/**" --exclude "venv/**" \ - --exclude "build_venv/**" --exclude "**/__pycache__/**" --exclude "bamboo-specs/**" + --exclude "build_venv/**" --exclude "**/__pycache__/**" if [[ -z "${bamboo_repository_pr_key}" ]] then echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}" - /usr/bin/sonar-scanner/bin/sonar-scanner \ - -Dsonar.projectKey=RED_$SERVICE_NAME \ - -Dsonar.sources=image_prediction \ + /usr/bin/sonar-scanner/bin/sonar-scanner -X\ + -Dsonar.projectKey=${project_name}_${SERVICE_NAME} \ + -Dsonar.sources=src,${pkg_src} \ -Dsonar.host.url=https://sonarqube.iqser.com \ -Dsonar.login=${bamboo_sonarqube_api_token_secret} \ -Dsonar.branch.name=${bamboo_planRepository_1_branch} \ @@ -43,8 +45,8 @@ then else echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}" /usr/bin/sonar-scanner/bin/sonar-scanner \ - -Dsonar.projectKey=RED_$SERVICE_NAME \ - -Dsonar.sources=image_prediction \ + -Dsonar.projectKey=${project_name}_${SERVICE_NAME} \ + -Dsonar.sources=src,${pkg_src} \ -Dsonar.host.url=https://sonarqube.iqser.com \ -Dsonar.login=${bamboo_sonarqube_api_token_secret} \ -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \