diff options
| author |   Mark Beierl <mark.beierl@emc.com> | 2016-02-03 17:18:54 -0500 |
|---|---|---|
| committer | Mark Beierl <mark.beierl@emc.com> | 2016-02-05 18:08:02 +0000 |
| commit | c4e424d2de2aa9376ce45b1766bfecdf841ecd3c (patch) | |
| tree | 078d2719a305af06129758791c68942aa23bb9c1 | |
| parent | c1bcc96e87ba1fc2ad04df372b39e06b07e00057 (diff) | |
Developer build process fix
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)
| -rwxr-xr-x | ci/merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/merge.sh b/ci/merge.sh index ddcc0eb..ca55281 100755 --- 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 |