Pin version of setuptools

Forces explicit version of setuptools to be used because
of an upstream change:
https://github.com/pypa/setuptools/issues/937

Change-Id: I4124dedee38713ca1bfa445944d8d79cf1be6c15
JIRA: STORPERF-102
Signed-off-by: mbeierl <mark.beierl@dell.com>

diff --git a/ci/verify.sh b/ci/verify.sh
index a0de93a..2b3446c 100755 (executable)
--- a/ci/verify.sh
+++ b/ci/verify.sh
@@ -18,7 +18,7 @@ fi
 virtualenv $WORKSPACE/storperf_venv
 source $WORKSPACE/storperf_venv/bin/activate
 
-pip install setuptools
+pip install --upgrade setuptools==33.1.1
 pip install autoflake==0.6.6
 pip install autopep8==1.2.2
 pip install coverage==4.1

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1a2b764..ce1f853 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -83,6 +83,7 @@ RUN puppet module install gdsoperations-graphite
 
 RUN chmod 600 ${repos_dir}/storperf/storperf/resources/ssh/storperf_rsa
 
+RUN pip install --upgrade setuptools==33.1.1
 RUN pip install -r ${repos_dir}/storperf/docker/requirements.pip
 
 COPY storperf.pp /etc/puppet/manifests/storperf.pp