From: MatthewLi <matthew.lijun@huawei.com>
Date: Thu, 14 Apr 2016 09:54:50 +0000 (+0000)
Subject: Merge "pip install openstack clients"
X-Git-Tag: colorado.1.0~60
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=77a0a075062b7f7ea3053eb93baf96d3edbd4ef5;hp=ade2540910ba19c5195b03c1f282b662c4c3db22;p=bottlenecks.git

Merge "pip install openstack clients"
---

diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index 70d0be0a..706718c2 100644
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -26,11 +26,8 @@ RUN apt-get update && apt-get install -y \
     git \
     sshpass \
     python \
-    python-glanceclient \
-    python-heatclient \
-    python-keystoneclient \
-    python-neutronclient \
-    python-novaclient
+    python-dev \
+    python-pip
 
 RUN apt-get -y autoremove && \
     apt-get clean
@@ -41,4 +38,4 @@ RUN git config --global http.sslVerify false
 RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
 RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 
-#COPY ./run_tests.sh /usr/local/bin/
+RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements.txt
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..0fe0608f
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+python-glanceclient>=2.0.0 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-heatclient>=0.6.0 # Apache-2.0