Fix OS_CLOUD export for image validation

[releng/global-jjb.git] / shell / python-tools-install.sh

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 3215e3b..660d5f2 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -19,21 +19,21 @@ 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
-    pip list > $pip_list_post
+    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
     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
+    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
-    pip list > $pip_list_pre
+    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)
@@ -44,17 +44,18 @@ else
 
     echo "Generating Requirements File"
     cat << 'EOF' > "$requirements_file"
-lftools[openstack]~=0.25.1
-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
-yq~=2.7.2
+lftools[openstack]
+python-heatclient
+python-openstackclient
+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"
-    rm -rf $requirements_file
+    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 --upgrade-strategy eager -r "$requirements_file"
+    rm -rf "$requirements_file"
 fi