X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=23221f23e800d7a8cb42fa16dc59563f7cb2ec03;hb=3caa379e03ccb1890190aa688dad75ddef33ddad;hp=fe49cca61cbf3dcf8b0ea235db4c4701b59a0438;hpb=db6a725bef90373462a0a69ffe527b61f7a5eaee;p=functest.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fe49cca61..23221f23e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,8 +11,8 @@
 # Execution:
 #    $ docker run -t -i \
 #      -e "INSTALLER_TYPE=fuel|apex|compass|joid \
-#      -e "INSTALLER_IP=10.20.0.2/172.30.10.73" \
-#      -v $(pwd)/config_functest.yaml:/home/opnfv/functest/conf/config_functest.yaml
+#      -e "INSTALLER_IP=10.20.0.2" \
+#      -v $(pwd)/config_functest.yaml:/home/opnfv/repos/functest/ci/config_functest.yaml
 #      opnfv/functest /bin/bash
 #
 # NOTE: providing config_functest.yaml is optional. If not provided, it will
@@ -33,7 +33,8 @@ 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/functest/testcases/:/home/opnfv/repos/functest/utils/
+ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/
+ENV CONFIG_FUNCTEST_YAML /home/opnfv/repos/functest/ci/config_functest.yaml
 WORKDIR /home/opnfv
 
 # Packaged dependencies
@@ -59,8 +60,11 @@ crudini \
 ruby1.9.1-dev \
 --no-install-recommends
 
+RUN pip install --upgrade pip
 
 RUN mkdir -p ${repos_dir}
+RUN mkdir -p /home/opnfv/functest/results
+RUN mkdir -p /home/opnfv/functest/conf
 RUN mkdir -p /root/.ssh
 RUN chmod 700 /root/.ssh
 
@@ -68,26 +72,40 @@ RUN git config --global http.sslVerify false
 RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest
 RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng
 RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor
-RUN git clone -b 0.3.3 https://github.com/openstack/rally.git ${repos_dir}/rally
+RUN git clone -b 0.5.0 https://github.com/openstack/rally.git ${repos_dir}/rally
 RUN git clone https://github.com/openstack/tempest.git ${repos_dir}/tempest
-RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_integration
+RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git ${repos_dir}/odl_test
 RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test
 RUN git clone https://github.com/openstack/networking-bgpvpn ${repos_dir}/bgpvpn
-RUN git clone https://gerrit.onosproject.org/OnosSystemTest  ${repos_dir}/onos
+RUN git clone https://github.com/wuwenbin2/OnosSystemTest.git ${repos_dir}/onos
 RUN git clone https://github.com/opnfv/promise ${repos_dir}/promise
 RUN git clone https://gerrit.opnfv.org/gerrit/ovno ${repos_dir}/ovno
+RUN git clone https://gerrit.opnfv.org/gerrit/copper ${repos_dir}/copper
+RUN git clone https://gerrit.opnfv.org/gerrit/moon ${repos_dir}/moon
+RUN git clone https://gerrit.opnfv.org/gerrit/sdnvpn ${repos_dir}/sdnvpn
+RUN git clone https://github.com/openstack/kingbird.git ${repos_dir}/kingbird
+RUN git clone https://gerrit.opnfv.org/gerrit/domino ${repos_dir}/domino
+RUN git clone https://gerrit.opnfv.org/gerrit/parser ${repos_dir}/parser
+RUN git clone https://gerrit.opnfv.org/gerrit/securityscanning ${repos_dir}/securityscanning
 
 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 /bin/bash ${repos_dir}/parser/tests/parser_install.sh ${repos_dir}
 RUN ${repos_dir}/rally/install_rally.sh --yes
 
 ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/
+ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-lxc.tar.gz /home/opnfv/functest/data/
+ADD http://205.177.226.237:9999/onosfw/firewall_block_image.img /home/opnfv/functest/data/
 
 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 cd ${repos_dir}/bgpvpn && pip install .
+RUN cd ${repos_dir}/kingbird && pip install -e .
+
 RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
     && cd /home/opnfv/repos/vims-test \
     && rvm autolibs enable"
@@ -106,6 +124,11 @@ RUN sudo apt-get install -y nodejs
 RUN cd ${repos_dir}/promise && sudo npm -g install npm@latest
 RUN cd ${repos_dir}/promise && npm install
 
-RUN /bin/echo -e "set nocompatible\nset backspace=2" >> /home/opnfv/.vimrc
-RUN echo "set nocompatible" >> /home/opnfv/.exrc
-RUN echo "alias ll='ls -lh'" >> /home/opnfv/.bashrc
+RUN echo "set nocompatible \n\
+set backspace=2" \
+>> /home/opnfv/.vimrc
+RUN echo set nocompatible >> /home/opnfv/.exrc
+RUN echo "alias ll='ls -lh' \n\
+. /home/opnfv/repos/functest/cli/functest-complete.sh" \
+>> /home/opnfv/.bashrc
+RUN cd ${repos_dir}/functest/cli && pip install .