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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 611f75bfe..23221f23e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,9 +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
 
@@ -70,7 +72,7 @@ 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://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
@@ -79,14 +81,22 @@ 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
@@ -94,6 +104,7 @@ 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 \