X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcommon-variables.sh;h=0001ac835b2e5638de0aed671ca494be0e7d5d09;hb=b9d610a9e522d71a89d2daeb6f71b2bc2a71cdf7;hp=346eb727eb51f45819b1b7852982c2965eb120dd;hpb=bc5892ef503dc4039aa0aae4043e5c9b2cc9a363;p=releng%2Fglobal-jjb.git diff --git a/shell/common-variables.sh b/shell/common-variables.sh index 346eb727..0001ac83 100644 --- a/shell/common-variables.sh +++ b/shell/common-variables.sh @@ -13,19 +13,12 @@ echo "---> common-variables.sh" # scripts. It is meant to be sourced in other scripts so that the variables can # be called. +# shellcheck disable=SC2140 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 -}