X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=c76865358f1774d70efd41d42a125e9d4176e9a4;hb=1873622e1b5bf98150db6850901d190dd6c35422;hp=e445bc20b82ad8da429c04466299ad8842602341;hpb=a70124ef46b23063d25ec178e627ac226b8cef8f;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index e445bc20..c7686535 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -25,15 +25,15 @@ if [[ -f $pip_list_pre ]]; then
             | 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
+    pip list > "$pip_list_pre"
     # These 'pip installs' only need to be executed during pre-build
 
     requirements_file=$(mktemp /tmp/requirements-XXXX.txt)
@@ -44,11 +44,13 @@ else
 
     echo "Generating Requirements File"
     cat << 'EOF' > "$requirements_file"
-lftools[openstack]~=0.25.2
+lftools[openstack]~=0.26.1
 python-heatclient~=1.16.1
 python-openstackclient~=3.16.0
 dogpile.cache~=0.6.8  # Version 0.7.[01] seems to break openstackclient
+more-itertools~=5.0.0
 niet~=1.4.2 # Extract values from yaml
+tox>=3.7.0. # Tox 3.7 or greater is necessary for parallel mode support
 yq~=2.7.2
 EOF
 
@@ -56,5 +58,5 @@ EOF
     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
+    rm -rf "$requirements_file"
 fi