SONARXML-252 Use a standard code for: Unify Platform Dogfooding

Author: alban-auzeill

.cirrus.yml

@@ -14,7 +14,6 @@ env:
   ARTIFACTORY_ACCESS_TOKEN: VAULT[development/artifactory/token/${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}-private-reader access_token]
   DEVELOCITY_TOKEN: VAULT[development/kv/data/develocity data.token]
   DEVELOCITY_ACCESS_KEY: develocity.sonar.build=${DEVELOCITY_TOKEN}
-  SONAR_PROJECT_KEY: "org.sonarsource.xml:xml"
   # Use bash (instead of sh on linux or cmd.exe on windows)
   CIRRUS_SHELL: bash
 
@@ -76,6 +75,7 @@ sonar_shadow_scan_and_issue_replication_task:
     cpu: 2
     memory: 2G
   env:
+    SONAR_PROJECT_KEY: "org.sonarsource.xml:xml"
     SHADOW_ORGANIZATION: "sonarsource"
     SHADOW_PROJECT_KEY: "SonarSource_sonar-xml"
     # to replicate issue states from next
@@ -90,8 +90,9 @@ sonar_shadow_scan_and_issue_replication_task:
         SHADOW_SONAR_HOST_URL: "https://sonarqube.us"
   maven_cache:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
-  build_script:
+  build_and_shadow_scan_script:
     - *log_develocity_url_script
+    - source cirrus-env BUILD
     - ./shadow-scan-and-issue-replication.sh
   cleanup_before_cache_script: cleanup_maven_repository
 

shadow-scan-and-issue-replication.sh

@@ -9,17 +9,22 @@ IRIS_JAR_PATH="target/libs/iris.jar"
 function build_and_analyze_the_project() {
   echo
   echo "===== Build and analyze the project targeting a shadow SonarQube instance"
-  mvn \
-    -Pcoverage \
-    -Dmaven.test.redirectTestOutputToFile=false \
+  local BUILD_CMD
+  if [[ -e "gradlew" ]]; then
+    BUILD_CMD="./gradlew --info --stacktrace --console plain build sonar"
+  else
+    source set_maven_build_version "$BUILD_NUMBER"
+    BUILD_CMD="mvn -Pcoverage -Dmaven.test.redirectTestOutputToFile=false --batch-mode --errors --show-version verify sonar:sonar"
+  fi
+  ${BUILD_CMD} \
+    -DbuildNumber="${BUILD_NUMBER}" \
     -Dsonar.host.url="${SHADOW_SONAR_HOST_URL}" \
     -Dsonar.token="${SHADOW_SONAR_TOKEN}" \
     -Dsonar.organization="${SHADOW_ORGANIZATION}" \
     -Dsonar.projectKey="${SHADOW_PROJECT_KEY}" \
     -Dsonar.analysis.buildNumber="${BUILD_NUMBER}" \
     -Dsonar.analysis.repository="${GITHUB_REPO}" \
-    --batch-mode --errors --show-version \
-    verify sonar:sonar
+    "$@"
 }
 
 function download_iris() {
@@ -63,8 +68,6 @@ function run_iris_with_and_without_dry_run() {
   fi
 }
 
-source cirrus-env BUILD
-. set_maven_build_version "$BUILD_NUMBER"
-build_and_analyze_the_project
+build_and_analyze_the_project "$@"
 download_iris
 run_iris_with_and_without_dry_run