diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2017-01-30 17:46:33 +0100 |
|---|---|---|
| committer | Jose Lausuch <jose.lausuch@ericsson.com> | 2017-01-30 16:48:28 +0000 |
| commit | ee4497b71377c5fb7e0a3e194c7e77121939f2c5 (patch) | |
| tree | df87cd073c1399fdcb2914c55b693492ae868a36 | |
| parent | 246f256f0345ee4f193c894661eaed87fc0d0008 (diff) | |
Make sure we have installed python_novaclient==6.0.0
Some requirements install novaclient 7.0.0 which belongs
to Ocata. It shows some warnings that are not relevant.
This will force to install the version for Newton.
Change-Id: Ic9c6b3e9558ef59475099fa41316f56a8a3192a0
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index dce657e8e..4e74dd3a1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -115,6 +115,9 @@ RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integr RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos +RUN pip install -r ${REPOS_DIR}/rally/requirements.txt +RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt + RUN cd ${FUNCTEST_REPO_DIR} \ && pip install -r requirements.txt \ && pip install . @@ -122,9 +125,6 @@ RUN cd ${FUNCTEST_REPO_DIR} \ RUN cd ${RELENG_MODULE_DIR} \ && pip install . -RUN pip install -r ${REPOS_DIR}/rally/requirements.txt -RUN pip install -r ${REPOS_DIR}/tempest/requirements.txt - RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \ -not -path "*tests/unit*" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \ && find ${FUNCTEST_REPO_DIR} -name "*.sh" |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755 diff --git a/requirements.txt b/requirements.txt index 28b3fed3e..b5e78bb59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ python-openstackclient==2.3.0 python-ceilometerclient==2.6.2 python-keystoneclient==3.5.0 python-neutronclient==6.0.0 +python-novaclient==6.0.0 python-congressclient==1.5.0 virtualenv==15.1.0 pexpect==4.0 |