X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fmaven-sonar.sh;h=e78d156f043074aea3d8d3cf2294218637d20e8c;hb=2a10c83b2d506008cc6c01c134515fb6328e1f3a;hp=4a3bdb8787a1ac34801dca4799772aea9d32feec;hpb=7f77f1fb4e685f631912c25955bfd54d5b06c22c;p=releng%2Fglobal-jjb.git

diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh
index 4a3bdb87..e78d156f 100644
--- a/shell/maven-sonar.sh
+++ b/shell/maven-sonar.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -8,31 +8,37 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-
+echo "---> maven-sonar.sh"
 # This script builds a Maven project and deploys it into a staging repo which
 # can be used to deploy elsewhere later eg. Nexus staging / snapshot repos.
 
 # DO NOT enable -u because $MAVEN_PARAMS and $MAVEN_OPTIONS could be unbound.
 # Ensure we fail the job if any steps fail.
-set -e -o pipefail
+set -xe -o pipefail
 set +u
 
 export MAVEN_OPTS
 
+declare -a params
+params+=("--global-settings $GLOBAL_SETTINGS_FILE")
+params+=("--settings $SETTINGS_FILE")
+
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean deploy \
-    -Dsonar \
-    --global-settings "$GLOBAL_SETTINGS_FILE" \
-    --settings "$SETTINGS_FILE" \
-    -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
-    $MAVEN_PARAMS $MAVEN_OPTIONS
+$MVN $MAVEN_GOALS \
+    -e -Dsonar \
+    ${params[*]} \
+    $MAVEN_OPTIONS $MAVEN_PARAMS
+
+if [ "$SONAR_HOST_URL" = "https://sonarcloud.io" ]; then
+    params+=("-Dsonar.projectKey=$PROJECT_KEY")
+    params+=("-Dsonar.organization=$PROJECT_ORGANIZATION")
+    params+=("-Dsonar.login=$API_TOKEN")
+fi
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN $SONAR_MAVEN_GOAL \
-    -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
-    --global-settings "$GLOBAL_SETTINGS_FILE" \
-    --settings "$SETTINGS_FILE" \
-    -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
-    $MAVEN_PARAMS $MAVEN_OPTIONS
+"$MVN" $SONAR_MAVEN_GOAL \
+    -e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \
+    ${params[*]} \
+    $MAVEN_OPTIONS $MAVEN_PARAMS