aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-12 09:49:53 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-12 09:49:53 +0000
commitdab05332b65c232b563f128aa7919949e30c10d2 (patch)
tree350391ae5a724695e11ee31ac23e927f5df5c8d0
parentdefb61f68b9b19962e8e7d0c561dd9fde4068d62 (diff)
parentfc938a5b176eedfa0e79662b6411105118c3d78e (diff)
Merge "make doctor tester available in functest docker image"
-rw-r--r--docker/Dockerfile1
-rw-r--r--docker/requirements.pip2
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1389aaeb..3cd6d90f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -59,6 +59,7 @@ RUN chmod 700 /root/.ssh
RUN git config --global http.sslVerify false
RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest
RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng
+RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor
RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally
RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_integration
RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test
diff --git a/docker/requirements.pip b/docker/requirements.pip
index f8c888a8..8644154c 100644
--- a/docker/requirements.pip
+++ b/docker/requirements.pip
@@ -4,6 +4,7 @@ python-neutronclient==2.6.0
python-novaclient==2.28.1
python-glanceclient==1.1.0
python-cinderclient==1.4.0
+python-ceilometerclient==1.5.1
python-keystoneclient==1.6.0
virtualenv==1.11.4
pexpect==4.0
@@ -12,3 +13,4 @@ robotframework==2.9.1
robotframework-requests==0.3.8
robotframework-sshlibrary==2.1.1
configObj==5.0.6
+Flask==0.10.1