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=5092a8eaa8cdc2112d542363df2781bd555a0c6d;hpb=64faafae2362d36e4d5c3e8d5fe6579b9d09cf55;p=releng%2Fglobal-jjb.git diff --git a/shell/common-variables.sh b/shell/common-variables.sh index 5092a8ea..b7aa52ae 100644 --- a/shell/common-variables.sh +++ b/shell/common-variables.sh @@ -16,17 +16,8 @@ echo "---> common-variables.sh" 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() { - echo "WARNING: lftools_activate should no longer be used and will be removed in a future release." - 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 -}