From: Tom Clegg <tom@curoverse.com>
Date: Wed, 2 Sep 2015 06:48:18 +0000 (-0400)
Subject: 6263: Skip re-installing virtualenv if it is already set up. Upgrade pip along with... 
X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/5ea1be908b4b46f029111deeff5216401a9662e2

6263: Skip re-installing virtualenv if it is already set up. Upgrade pip along with setuptools.
---

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index d1c9c9e..9ca70b8 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -392,11 +392,13 @@ mkdir -p "$GOPATH/src/git.curoverse.com"
 ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" \
     || fatal "symlink failed"
 
-virtualenv --setuptools "$VENVDIR" || fatal "virtualenv $VENVDIR failed"
+if ! [[ -e "$VENVDIR/bin/activate" ]] || ! [[ -e "$VENVDIR/bin/pip" ]]; then
+    virtualenv --setuptools "$VENVDIR" || fatal "virtualenv $VENVDIR failed"
+fi
 . "$VENVDIR/bin/activate"
 
 if (pip install setuptools | grep setuptools-0) || [ "$($VENVDIR/bin/easy_install --version | cut -d\  -f2 | cut -d. -f1)" -lt 18 ]; then
-    pip install --upgrade setuptools
+    pip install --upgrade setuptools pip
 fi
 
 # Note: this must be the last time we change PATH, otherwise rvm will