Code Review / storperf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c1bcc96)
Developer build process fix 47/9447/1
authorMark Beierl <mark.beierl@emc.com>
Wed, 3 Feb 2016 22:18:54 +0000 (17:18 -0500)
committerMark Beierl <mark.beierl@emc.com>
Fri, 5 Feb 2016 18:08:02 +0000 (18:08 +0000)
Fix the installation os setuptools so that it
does not conflict with mock.

Change-Id: I7c497d36c80a795fc99b329da2d171a265e4eacc
JIRA: STORPERF-35
Signed-off-by: Mark Beierl <mark.beierl@emc.com>
(cherry picked from commit fd4b99b086583bc8dc91950393ffed646f7eee59)

ci/merge.sh patch | blob | history

diff --git a/ci/merge.sh b/ci/merge.sh
index ddcc0eb..ca55281 100755 (executable)
--- a/ci/merge.sh
+++ b/ci/merge.sh
@@ -16,7 +16,7 @@ fi
 virtualenv $WORKSPACE/storperf_venv
 source $WORKSPACE/storperf_venv/bin/activate
 
-easy_install -U setuptools
+pip install --upgrade setuptools
 pip install nose -I
 pip install coverage -I
 python ci/setup.py develop