X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=2ca350deb916f452740d1f9d66d1afe560c54a0e;hb=4867c0799530acf13f7527c6a026879bdfb34e06;hp=7abaed9e51bdaa422e31e9ea470804258c6724b7;hpb=7f064ed20dd2fdf8ed25976b840afa250023e657;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 7abaed9e..2ca350de 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -12,6 +12,26 @@ echo "---> python-tools-install.sh"
 
 set -eufo pipefail
 
+# Souce the python version from lf-env.sh if available.
+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 "Setup up pyenv"
+    export PYENV_ROOT="/opt/pyenv"
+    export PATH="$PYENV_ROOT/bin:$PATH"
+    pyenv versions
+    if command -v pyenv 1>/dev/null 2>&1; then
+        eval "$(pyenv init - --no-rehash)"
+        pyenv local "$python"
+    fi
+fi
+
 # This script will typically be called during pre-build & post-build.
 # Create the user venv during pre-build.
 if [[ ! -f /tmp/pre-build-complete ]]; then
@@ -23,6 +43,7 @@ if [[ ! -f /tmp/pre-build-complete ]]; then
 
     echo "Generating Requirements File"
     cat << 'EOF' > "$requirements_file"
+openstacksdk<0.99
 python-heatclient
 python-openstackclient
 python-magnumclient
@@ -38,6 +59,8 @@ yq
 # necessary so that future maintainers of this file can make decisions to
 # 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
@@ -50,10 +73,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