fix

Author: Wohops

.cirrus/analysis.sh

@@ -1,28 +1,22 @@
 #!/bin/bash
 
 function run_analysis {
-  # extra analysis parameters are set in the 'sonar-project.properties'
+  # deal with strange SonarQube configuration for the US region
+  SONAR_REGION=""
   if [ "$SONAR_HOST_URL" == "https://sonarqube.us" ]; then
-      # deal with strange SonarQube configuration for the US region
-      pysonar \
-      -Dsonar.host.url="$SONAR_HOST_URL" \
-      -Dsonar.region=us \
-      -Dsonar.token="$SONAR_TOKEN" \
-      -Dsonar.analysis.buildNumber=$CI_BUILD_NUMBER \
-      -Dsonar.analysis.pipeline="$PIPELINE_ID" \
-      -Dsonar.analysis.sha1="$GIT_SHA1" \
-      -Dsonar.analysis.repository="$GITHUB_REPO" \
-      "$@"
-  else
-      pysonar \
-      -Dsonar.host.url="$SONAR_HOST_URL" \
-      -Dsonar.token="$SONAR_TOKEN" \
-      -Dsonar.analysis.buildNumber=$CI_BUILD_NUMBER \
-      -Dsonar.analysis.pipeline="$PIPELINE_ID" \
-      -Dsonar.analysis.sha1="$GIT_SHA1" \
-      -Dsonar.analysis.repository="$GITHUB_REPO" \
-      "$@"
+    SONAR_REGION="-Dsonar.region=us"
   fi
+
+  # extra analysis parameters are set in the 'sonar-project.properties'
+  pysonar \
+  -Dsonar.host.url="$SONAR_HOST_URL" \
+  ${SONAR_REGION} \
+  -Dsonar.token="$SONAR_TOKEN" \
+  -Dsonar.analysis.buildNumber=$CI_BUILD_NUMBER \
+  -Dsonar.analysis.pipeline="$PIPELINE_ID" \
+  -Dsonar.analysis.sha1="$GIT_SHA1" \
+  -Dsonar.analysis.repository="$GITHUB_REPO" \
+  "$@"
 }
 
 # generic environment variables