X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcommon-variables.sh;h=b7aa52aefe6f9a91d4b1e35a25a3c62bf1a89edc;hb=refs%2Ftags%2Fv0.84.0;hp=6a5d2fb098a88c20703f18593e6805bed6162751;hpb=1f02269143fda3e22bd11650e1001e8f7c93afee;p=releng%2Fglobal-jjb.git diff --git a/shell/common-variables.sh b/shell/common-variables.sh index 6a5d2fb0..b7aa52ae 100644 --- a/shell/common-variables.sh +++ b/shell/common-variables.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 "---> common-variables.sh" # This file contains a list of variables that are generally useful in many # scripts. It is meant to be sourced in other scripts so that the variables can # be called. @@ -16,16 +16,8 @@ MAVEN_OPTIONS="$(echo --show-version \ --batch-mode \ -Djenkins \ - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ + "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer"\ +".Slf4jMavenTransferListener=warn" \ -Dmaven.repo.local=/tmp/r \ -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)" echo "$MAVEN_OPTIONS" - -# Activates the lftools virtualenv -lftools_activate() { - virtualenv --quiet "/tmp/v/lftools" - set +u # Ignore unbound variables in activate - # shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 - source "/tmp/v/lftools/bin/activate" - set -u # Restore unbound variable checking -}