From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 31 Aug 2020 21:13:22 +0000 (-0700)
Subject: Fix Python env issues - Part2
X-Git-Tag: v0.57.1~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=cf8b441e368ad0ce9e8c2e0b8ddb7aad0d7d690c;p=releng%2Fglobal-jjb.git

Fix Python env issues - Part2

This is a follow up for commit
f4f795bda67897b1b1e527e99e0b5f627ca1a4db
The release-job.sh script needed the same fix

Issue-ID: IT-20528
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I88fbad702fcd329c062a1f86a415ba99325882ab
---

diff --git a/shell/release-job.sh b/shell/release-job.sh
index 3ad45306..1c1b5707 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -11,12 +11,12 @@
 echo "---> release-job.sh"
 set -eu -o pipefail
 
-echo "INFO: creating virtual environment"
-virtualenv -p python3 /tmp/venv
-PATH=/tmp/venv/bin:$PATH
-pipup="python -m pip install -q --upgrade pip idna==2.8 lftools jsonschema twine yq"
-echo "INFO: $pipup"
-$pipup
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+# Version controlled by JJB_VERSION
+lf-activate-venv lftools pip idna==2.8 lftools jsonschema twine yq readline
+
 # show installed versions
 python -m pip --version
 python -m pip freeze
diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 91e040ad..d7f4be2b 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -13,6 +13,12 @@ echo "---> tox-run.sh"
 # do not use -o pipefail
 set -eux
 
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+# Version controlled by JJB_VERSION
+lf-activate-venv readline
+
 ARCHIVE_TOX_DIR="$WORKSPACE/archives/tox"
 ARCHIVE_DOC_DIR="$WORKSPACE/archives/docs"
 mkdir -p "$ARCHIVE_TOX_DIR"