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

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 1f5beec0..a2c6da3e 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2018 The Linux Foundation and others.
@@ -10,33 +10,32 @@
 ##############################################################################
 echo "---> python-tools-install.sh"
 
-set -eu -o pipefail
-
-# Generate a list of 'pip' packages pre-build/post-build
-# During post-build, perform a diff on the two lists and copy files to archive directory
-echo "Listing pip packages"
-pip_list_pre=/tmp/pip-list-pre.txt
-pip_list_post=/tmp/pip-list-post.txt
-pip_list_diffs=/tmp/pip-list-diffs.txt
-if [[ -f $pip_list_pre ]]; then
-    python3 -m pip list > $pip_list_post
-    echo "Compare pip packages before/after..."
-    if diff --suppress-common-lines $pip_list_pre $pip_list_post \
-            | tee $pip_list_diffs; then
-        echo "No diffs" | tee $pip_list_diffs
+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
-    mkdir -p "$WORKSPACE/archives"
-    cp "$pip_list_pre" "$pip_list_post" "$pip_list_diffs" "$WORKSPACE/archives"
-    rm -rf "$pip_list_pre" "$pip_list_post" "$pip_list_diffs"
-    ls "$WORKSPACE/archives"
-    # Would just like to 'exit 0' here but we can't because the
-    # log-deploy.sh script is 'appended' to this file and it would not
-    # be executed.
-else
-    python3 -m pip list > "$pip_list_pre"
-    # These 'pip installs' only need to be executed during pre-build
-
-    requirements_file=$(mktemp /tmp/requirements-XXXX.txt)
+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
+    requirements_file=$(mktemp /tmp/requirements-XXXXXX)
 
     # Note: To test lftools master branch change the lftools configuration below in
     #       the requirements file from "lftools[openstack]~=#.##.#" to
@@ -44,18 +43,47 @@ else
 
     echo "Generating Requirements File"
     cat << 'EOF' > "$requirements_file"
-lftools[openstack]
 python-heatclient
 python-openstackclient
+python-magnumclient
+kubernetes
 niet~=1.4.2
-tox>=3.7.0 # Tox 3.7 or greater is necessary for parallel mode support
+cryptography<3.4
 yq
+
+# PINNED INDIRECT DEPENDENCIES
+# ============================
+# The libraries listed below should be considered workarounds and thus need
+# to have a link to a JIRA and any relevant pkg versions and support packages
+# 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
 
-    # Use `python -m pip` to ensure we are using the latest version of pip
-    python3 -m venv ~/.local
-    python3 -m pip install --user --quiet --upgrade pip
-    python3 -m pip install --user --quiet --upgrade setuptools
-    python3 -m pip install --user --quiet --upgrade -r "$requirements_file"
+    #Python 3.5 in Ubuntu 16.04 workaround
+    if [[ -f /etc/lsb-release ]]; then
+        # shellcheck disable=SC1091
+        source /etc/lsb-release
+        if [[ $DISTRIB_RELEASE == "16.04" && $DISTRIB_ID == "Ubuntu" ]]; then
+            echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
+            echo "zipp==1.1.0" >> "$requirements_file"
+        fi
+    fi
+
+    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
+    python3 -m pip --version
+    python3 -m pip freeze
+
     rm -rf "$requirements_file"
+    touch /tmp/pre-build-complete
 fi