X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fmaven-sonar.sh;h=58572341058dfc110a23b2d722fa957f7ef75c3f;hb=11bccd3d96d180f93ae96cd330e23565ba351aa5;hp=525125b1eb0440de65acc79740797054085265e6;hpb=ed320523c5e3c70a6f54cf9f57369f8305f9b342;p=releng%2Fglobal-jjb.git diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh index 525125b1..58572341 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. @@ -14,25 +14,23 @@ # 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 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters. # shellcheck disable=SC2086 -$MVN clean deploy \ - -Dsonar \ +$MVN clean install \ + -e -Dsonar \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ - -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \ $MAVEN_OPTIONS $MAVEN_PARAMS # 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" \ + -e -Dsonar -Dsonar.host.url="$SONAR_HOST_URL" \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ - -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \ $MAVEN_OPTIONS $MAVEN_PARAMS