aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-11-16 07:16:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-16 07:16:42 +0000
commit7256df5aa9d1135e5c8d080e3ca2f1744783142e (patch)
treebea9979ae3ad6199b0a4215f1378bcbb633e457c /docker
parentcd2e2d67016b78517f86a2cafad9f3f23adc94d7 (diff)
parent56a8a8c2ca7092eec328cbfc462d6c6a984e05e6 (diff)
Merge "Wrap the Functest and install it as module by pip."
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile4
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e8cef3c0..37581a67 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,9 +40,7 @@ ENV repos_dir /home/opnfv/repos
ENV creds /home/opnfv/functest/conf/openstack.creds
ENV TERM xterm
ENV COLORTERM gnome-terminal
-ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/
ENV CONFIG_FUNCTEST_YAML /home/opnfv/repos/functest/functest/ci/config_functest.yaml
-ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/:/home/opnfv/repos/functest
WORKDIR /home/opnfv
# Packaged dependencies
@@ -105,6 +103,7 @@ RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwat
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 cd ${repos_dir}/functest && pip install .
RUN pip install -r ${repos_dir}/rally/requirements.txt
RUN pip install -r ${repos_dir}/tempest/requirements.txt
@@ -156,4 +155,3 @@ RUN echo set nocompatible >> /home/opnfv/.exrc
RUN echo "alias ll='ls -lh' \n\
. /home/opnfv/repos/functest/functest/cli/functest-complete.sh" \
>> /home/opnfv/.bashrc
-RUN cd ${repos_dir}/functest/functest/cli && pip install .