summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorhelenyao <yaohelan@huawei.com>2016-11-13 21:10:06 -0500
committerhelenyao <yaohelan@huawei.com>2016-11-13 21:23:41 -0500
commit56a8a8c2ca7092eec328cbfc462d6c6a984e05e6 (patch)
tree391a418feaf1d271a7d56100331dd476d466054c /docker
parentf9fbe4211144a556820bb0933709224ff3fa90c0 (diff)
Wrap the Functest and install it as module by pip.
JIRA: FUNCTEST-538 1. PYTHONPATH is removed. 2. Functest will be installed by pip. 3. Dockerfile is updated accordingly. Change-Id: Ie4eed9df045b121e2688dcb34c25779db775f104 Signed-off-by: helenyao <yaohelan@huawei.com>
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 b0f5cc9e2..995d1ca13 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
@@ -152,4 +151,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 .