From: Mark Beierl <mark.beierl@emc.com>
Date: Wed, 3 Feb 2016 22:18:54 +0000 (-0500)
Subject: Developer build process fix
X-Git-Tag: brahmaputra.1.0~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F9447%2F1;p=storperf.git

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)
---

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