X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcommon-variables.sh;h=0001ac835b2e5638de0aed671ca494be0e7d5d09;hb=04547fcca5cabd3d9ad24fced4a0cf268d789296;hp=6a5d2fb098a88c20703f18593e6805bed6162751;hpb=bd666934503c622d939adaccc6d1be7066c6a214;p=releng%2Fglobal-jjb.git

diff --git a/shell/common-variables.sh b/shell/common-variables.sh
index 6a5d2fb0..0001ac83 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,24 +8,17 @@
 # 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.
 
+# 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
-}