From: Aric Gardner <agardner@linuxfoundation.org>
Date: Wed, 2 Sep 2020 17:01:19 +0000 (-0400)
Subject: Tox is called from system python2
X-Git-Tag: v0.57.1~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F65285%2F3;p=releng%2Fglobal-jjb.git

Tox is called from system python2

which tox
/usr/bin/tox
tox --version
3.14.5 imported from
/usr/lib/python2.7/site-packages/tox/__init__.pyc

if $PYTHON=python3 we are not updaing tox
to the lastest version.

for some reason running this old tox
broke things. this appears to fix.

Also revert the lfenv stuff that we
don't want in tox-run

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I2f964ec5123bd4a3b5fcc75f3d1ba38c0810cd8a
---

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 9ad33295..0434b3a2 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -28,11 +28,8 @@ if [[ -f /etc/lsb-release ]]; then
 fi
 
 if [[ $done != "True" ]]; then
-    if [[ $PYTHON == "python2" ]]; then
-        $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
-    else
-        $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
-    fi
+        python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
+        python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
 fi
 
 # installs are silent, show version details in log
diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index d7f4be2b..91e040ad 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -13,12 +13,6 @@ 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"