X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=a2c6da3e25058fe2b0447e1c9836a8aad5a265d5;hb=bafd57c92d85a6c8b2c3fd3dbe30aa3a09f8f620;hp=8251487d9c3639dc2195ec919fc75184003c4033;hpb=1a7660851f6e1a32ff2485b75042c65fa8c6e611;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 8251487d..a2c6da3e 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -13,12 +13,16 @@ echo "---> python-tools-install.sh"
 set -eufo pipefail
 
 # Souce the python version from lf-env.sh if available.
-python="python3.8.13"
+python="python3"
 if [[ -f ~/lf-env.sh ]]; then
+    # shellcheck source=/dev/null
     source ~/lf-env.sh
     lf-activate-venv --python "$python" lftools
+    # Save the virtualenv path
+    # shellcheck disable=SC2154
+    echo "$lf_venv" > "/tmp/.os_lf_venv"
 elif [[ -d /opt/pyenv ]]; then
-    echo "---> Setting up pyenv"
+    echo "Setup up pyenv"
     export PYENV_ROOT="/opt/pyenv"
     export PATH="$PYENV_ROOT/bin:$PATH"
     pyenv versions
@@ -39,7 +43,6 @@ if [[ ! -f /tmp/pre-build-complete ]]; then
 
     echo "Generating Requirements File"
     cat << 'EOF' > "$requirements_file"
-openstacksdk<0.99
 python-heatclient
 python-openstackclient
 python-magnumclient
@@ -56,6 +59,7 @@ yq
 # remove the workarounds in the future.
 importlib-resources<2.0.0  # virtualenv 20.0.21 requires importlib-resources<2.0.0 (RELENG-2993)
 pyparsing<3.0.0 # httplib2 0.20.1 requires pyparsing<3,>=2.4.2
+urllib3~=1.26.15 # python-jenkins-1.8.0 requires urllib3-1.26
 EOF
 
     #Python 3.5 in Ubuntu 16.04 workaround
@@ -68,10 +72,12 @@ EOF
         fi
     fi
 
-    python3 -m pip install --user --quiet --upgrade pip
-    python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
-    python3 -m pip install --user --quiet --no-warn-script-location --upgrade lftools[openstack]
-    python3 -m pip install --user --quiet --no-warn-script-location --upgrade \
+    python3 -m pip install --quiet --upgrade pip
+    # TODO: temporarily pinning setuptools to avoid plugin version format issues
+    # https://github.com/pypa/setuptools/issues/3772#issuecomment-1384342813
+    python3 -m pip install --quiet --no-warn-script-location --upgrade setuptools==65.7.0
+    python3 -m pip install --quiet --no-warn-script-location --upgrade lftools[openstack] urllib3~=1.26.15
+    python3 -m pip install --quiet --no-warn-script-location --upgrade \
         --upgrade-strategy eager -r "$requirements_file"
     # installs are silent, show version details in log
     python3 --version