projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c4d584c
)
5766: Remove "remove dependencies" step. Detect existing PyYAML faster.
author
Tom Clegg <tom@curoverse.com>
Thu, 21 May 2015 12:57:50 +0000
(08:57 -0400)
committer
Nico Cesar <nico@nicocesar.com>
Thu, 21 May 2015 15:32:28 +0000
(11:32 -0400)
jenkins/run-tests.sh
patch
|
blob
|
history
diff --git
a/jenkins/run-tests.sh
b/jenkins/run-tests.sh
index be35ae9cf2e4daed87573f76c0a8b1a07c63e73e..1a699a85512224cb971efe41deea4c4f6b01437a 100755
(executable)
--- a/
jenkins/run-tests.sh
+++ b/
jenkins/run-tests.sh
@@
-370,10
+370,6
@@
ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" \
virtualenv --setuptools "$VENVDIR" || fatal "virtualenv $VENVDIR failed"
. "$VENVDIR/bin/activate"
virtualenv --setuptools "$VENVDIR" || fatal "virtualenv $VENVDIR failed"
. "$VENVDIR/bin/activate"
-# When re-using $VENVDIR, upgrade any packages (except arvados) that are
-# already installed
-pip install --quiet --upgrade `pip freeze | grep -v arvados | cut -f1 -d=`
-
# Note: this must be the last time we change PATH, otherwise rvm will
# whine a lot.
setup_ruby_environment
# Note: this must be the last time we change PATH, otherwise rvm will
# whine a lot.
setup_ruby_environment
@@
-386,8
+382,9
@@
then
fi
# Needed for run_test_server.py which is used by certain (non-Python) tests.
fi
# Needed for run_test_server.py which is used by certain (non-Python) tests.
-echo "pip install -q PyYAML"
-pip install --quiet PyYAML || fatal "pip install PyYAML failed"
+pip freeze 2>/dev/null | egrep ^PyYAML= \
+ || pip install PyYAML \
+ || fatal "pip install PyYAML failed"
# If Python 3 is available, set up its virtualenv in $VENV3DIR.
# Otherwise, skip dependent tests.
# If Python 3 is available, set up its virtualenv in $VENV3DIR.
# Otherwise, skip dependent tests.