X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fmaven-sonar.sh;h=706697b10b54e7824d1b7c8927e4464f78958f5b;hb=25d30f63b445e6201acebb0a3284c6e770c64d60;hp=ae9648a82af299dafa396a868a8f11c4f568cba1;hpb=5fa5b9907684b63824352a353d31365e95cfbca3;p=releng%2Fglobal-jjb.git diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh index ae9648a8..706697b1 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,7 +8,7 @@ # 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. @@ -19,20 +19,26 @@ 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 \ +$MVN clean install \ -e -Dsonar \ - --global-settings "$GLOBAL_SETTINGS_FILE" \ - --settings "$SETTINGS_FILE" \ - -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \ + ${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 \ +"$MVN" $SONAR_MAVEN_GOAL \ -e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \ - --global-settings "$GLOBAL_SETTINGS_FILE" \ - --settings "$SETTINGS_FILE" \ - -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \ + ${params[*]} \ $MAVEN_OPTIONS $MAVEN_PARAMS