X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=cb8e4c035a50315ecb4be30ffaa43f2a50ad231e;hb=0157be0431600dd56aaaa3260b72cc40011f91ac;hp=9ff0f4f624bc1b167232683ad339f366c359b162;hpb=81029a5ad95469526166dbb114c86a3ab52d4c5f;p=functest.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9ff0f4f62..cb8e4c035 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 
 ARG BRANCH=master
 ARG TEMPEST_TAG=12.2.0
-ARG RALLY_TAG=0.5.0
+ARG RALLY_TAG=0.7.0
 ARG ODL_TAG=release/beryllium-sr3
 ARG OPENSTACK_TAG=stable/mitaka
 ARG KINGBIRD_TAG=0.2.2
@@ -41,7 +41,8 @@ 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/ci/config_functest.yaml
+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
@@ -53,7 +54,7 @@ git \
 gcc \
 wget \
 python-dev \
-python-mock \
+python-mock \
 python-pip \
 bundler \
 postgresql \
@@ -107,7 +108,8 @@ 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 find ${repos_dir}/functest -name "*.py" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755
+RUN find ${repos_dir}/functest -name "*.py" \
+    -not -path *unit_tests* |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
 
 RUN /bin/bash ${repos_dir}/parser/tests/parser_install.sh ${repos_dir}
@@ -120,7 +122,7 @@ ADD http://205.177.226.237:9999/onosfw/firewall_block_image.img /home/opnfv/func
 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 RUN curl -L https://get.rvm.io | bash -s stable
 
-RUN /bin/bash -c ". /home/opnfv/repos/functest/testcases/features/sfc/tacker_client_install.sh"
+RUN /bin/bash -c ". /home/opnfv/repos/functest/functest/opnfv_tests/features/sfc/tacker_client_install.sh"
 RUN cd ${repos_dir}/bgpvpn && pip install .
 RUN cd ${repos_dir}/kingbird && pip install -e .
 RUN cd ${repos_dir}/moon/moonclient/ && python setup.py install