summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile4
-rw-r--r--docker/requirements.pip1
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