diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-11-13 16:47:07 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-11-13 16:47:07 +0100 |
| commit | a5956d3b0aca43fea817a0ffe9e6d0cafea725a3 (patch) | |
| tree | 0be8af06bd53a513a8a524727746cb2406823a5a | |
| parent | 583fa469dffc78bdb2be6f93668824b59dcd7264 (diff) | |
Fix problem with neutron python version
This patch tries to solve the conflict
with the neutron and keystone versions
Downgrading Rally, it doesn't need to install
the Newton clients.
https://build.opnfv.org/ci/view/functest/job/functest-fuel-baremetal-daily-colorado/561/console
Change-Id: I5795a2d5e3cefc8715fcc232db5be6abab69062e
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/requirements.pip | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d5d0c8934..b204ca9c4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" ARG BRANCH=stable/colorado ARG TEMPEST_TAG=12.2.0 -ARG RALLY_TAG=0.5.0 +ARG RALLY_TAG=0.3.2 ARG ODL_TAG=release/beryllium-sr3 ARG OPENSTACK_TAG=stable/mitaka ARG KINGBIRD_TAG=0.2.2 @@ -102,9 +102,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_dir}/vims-test RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${repos_dir}/onos -RUN pip install -r ${repos_dir}/functest/docker/requirements.pip RUN pip install -r ${repos_dir}/rally/requirements.txt RUN pip install -r ${repos_dir}/tempest/requirements.txt +RUN pip install -r ${repos_dir}/functest/docker/requirements.pip RUN find ${repos_dir}/functest -name "*.py" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 RUN find ${repos_dir}/functest -name "*.sh" |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755 diff --git a/docker/requirements.pip b/docker/requirements.pip index 7ba1a350c..13bdb0390 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -12,6 +12,7 @@ gitpython==1.0.1 python-openstackclient==2.3.0 python-ceilometerclient==1.5.1 python-keystoneclient==2.3.1 +python-neutronclient==4.1.2 virtualenv==1.11.4 pexpect==4.0 requests==2.8.0 |