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

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 6b963a48..7abaed9e 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.
@@ -8,29 +8,58 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+echo "---> python-tools-install.sh"
 
-set -eux -o pipefail
+set -eufo pipefail
 
-REQUIREMENTS_FILE=$(mktemp /tmp/requirements-XXXX.txt)
+# 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
-#       git+https://github.com/lfit/releng-lftools.git#egg=lftools[openstack]
+    # Note: To test lftools master branch change the lftools configuration below in
+    #       the requirements file from "lftools[openstack]~=#.##.#" to
+    #       git+https://github.com/lfit/releng-lftools.git#egg=lftools[openstack]
 
-cat << EOF > "$REQUIREMENTS_FILE"
-lftools[openstack]~=0.21.0
-python-heatclient~=1.16.1
-python-openstackclient~=3.16.0
-dogpile.cache~=0.6.8  # Version 0.7.[01] seems to break openstackclient
-niet~=1.4.2 # Extract values from yaml
+    echo "Generating Requirements File"
+    cat << 'EOF' > "$requirements_file"
+python-heatclient
+python-openstackclient
+python-magnumclient
+kubernetes
+niet~=1.4.2
+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)
 EOF
 
-echo "Requirements file"
-echo "-----------------"
-cat "$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 --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 \
+        --upgrade-strategy eager -r "$requirements_file"
+    # installs are silent, show version details in log
+    python3 --version
+    python3 -m pip --version
+    python3 -m pip freeze
 
-# Use `python -m pip` to ensure we are using the latest version of pip
-python -m pip install --user --quiet --upgrade pip
-python -m pip install --user --quiet --upgrade setuptools
-python -m pip install --user --quiet --upgrade -r "$REQUIREMENTS_FILE"
-pip freeze
+    rm -rf "$requirements_file"
+    touch /tmp/pre-build-complete
+fi