From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Tue, 27 Oct 2015 12:36:30 +0000 (+0000)
Subject: Merge "Move git clone of ODL tests repo to Dockefile"
X-Git-Tag: 0.2~1930
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6c22017400294fa017a28de00e6cc756db2d450f;p=functest-xtesting.git

Merge "Move git clone of ODL tests repo to Dockefile"
---

6c22017400294fa017a28de00e6cc756db2d450f
diff --cc docker/Dockerfile
index 1ac04435,53cfe15f..59a262d2
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -52,7 -52,6 +52,8 @@@ RUN git config --global http.sslVerify 
  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://github.com/openstack/rally.git ${repos_dir}/rally
+ RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_integration
  
  RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
 +
- 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-disk.img /home/opnfv/functest/data/