diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-12 09:51:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-12 09:51:14 +0000 |
| commit | 3ff47a399463ea71e4ae83fb5ce70e338e2de9a7 (patch) | |
| tree | 85128bdc60a67413f0c4d8fa84e641ed9cb7889d /docker | |
| parent | c68630bcbf56182e11d8b8f493bbc826f392d3d3 (diff) | |
| parent | 04032d8ec870fcbfb64379d22b7aad3e1dd1e3e4 (diff) | |
Merge "make doctor tester available in functest docker image" into stable/brahmaputra
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/requirements.pip | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 1389aaebf..3cd6d90f8 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 f8c888a82..8644154cf 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 |