@@ -90,29 +90,36 @@ commands:
9090 steps :
9191 - attach_workspace :
9292 at : .
93- - run :
94- name : Install Java
95- command : |
96- sudo apt-get update
97- sudo apt-get install openjdk-11-jdk
9893 - run :
9994 name : Run SonarQube to report the coverage
10095 command : |
10196 . venv/bin/activate
10297 coverage combine ./coverage_results
10398 coverage xml -i
104- wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.8.1.3023.zip
105- unzip -d /tmp /tmp/sonar-scanner-cli.zip
106- if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
107- /tmp/sonar-scanner-4.8.1.3023/bin/sonar-scanner \
108- -Dsonar.host.url=${SONARQUBE_URL} \
109- -Dsonar.login="${SONARQUBE_LOGIN}" \
110- -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \
99+
100+ PR_NUMBER=$(echo ${CIRCLE_PULL_REQUEST} | sed 's/.*\///')
101+ SONAR_SCANNER_VERSION=7.2.0.5079
102+ export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64
103+ SONAR_TOKEN=${SONAR_TOKEN}
104+
105+ curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux-x64.zip
106+ unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
107+ export PATH=$SONAR_SCANNER_HOME/bin:$PATH
108+ export SONAR_SCANNER_OPTS="-server"
109+ if [[ -n "${PR_NUMBER}" ]]; then
110+ sonar-scanner \
111+ -Dsonar.organization=instana \
112+ -Dsonar.projectKey=instana_python-sensor \
113+ -Dsonar.sources=. \
114+ -Dsonar.host.url="${SONARQUBE_URL}" \
115+ -Dsonar.pullrequest.key="${PR_NUMBER}" \
111116 -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}"
112117 else
113- /tmp/sonar-scanner-4.8.1.3023/bin/sonar-scanner \
114- -Dsonar.host.url=${SONARQUBE_URL} \
115- -Dsonar.login="${SONARQUBE_LOGIN}" \
118+ sonar-scanner \
119+ -Dsonar.organization=instana \
120+ -Dsonar.projectKey=instana_python-sensor \
121+ -Dsonar.sources=. \
122+ -Dsonar.host.url="${SONARQUBE_URL}" \
116123 -Dsonar.branch.name="${CIRCLE_BRANCH}"
117124 fi
118125 - store_artifacts :
@@ -296,7 +303,7 @@ jobs:
296303 - pip-install-deps
297304 - pip-install-tests-deps
298305 - store-pytest-results
299- # - run_sonarqube
306+ - run_sonarqube
300307
301308workflows :
302309 tests :
0 commit comments