X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=3a852d3497503fb699b03ce109bf2900e3b8b8d7;hb=b55451a53da28d40c62de5cae462302a32fe4c31;hp=4506062c3ba14797b58dfd56b14f400dea97e52b;hpb=90282bdb059493231c298e0d5d6aa7ccfeac7bf7;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 4506062c..3a852d34 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,19 +8,39 @@
 # 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-XXXX.txt)
 
-cat << EOF > "$REQUIREMENTS_FILE"
-lftools[openstack]~=0.18.0
-python-heatclient~=1.16.1
-python-openstackclient~=3.16.0
+    # 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]
+
+    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
+yq
 EOF
 
-# 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
+    # Use `python -m pip` to upgrade to the latest pip into user site-packages
+    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 --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