summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-04-14 05:51:19 -0400
committerMatthewLi <matthew.lijun@huawei.com>2016-04-14 05:51:19 -0400
commitfcdd99acc0a2bac7da6ba961c58b7a3669e8d2b9 (patch)
tree4ad8603ff9e3815144b5554dc3506f9c89647f9f
parent438bb0ede748a7c074f55e31fe64a0200073bef1 (diff)
pip install openstack clients
JIRA: BOTTLENECK-48 Change-Id: I863ce174f3c9e75a6c15325cacb6e1b1ab72d591 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
-rw-r--r--ci/docker/Dockerfile9
-rw-r--r--requirements.txt4
2 files changed, 7 insertions, 6 deletions
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