From: Jose Lausuch <jose.lausuch@ericsson.com>
Date: Fri, 11 Nov 2016 07:16:57 +0000 (+0000)
Subject: Merge "Remove kingbird installation"
X-Git-Tag: danube.1.RC1~317
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aa3b9e80b769a083d41b41d61daf1cf7869aa98b;p=functest.git

Merge "Remove kingbird installation"
---

aa3b9e80b769a083d41b41d61daf1cf7869aa98b
diff --cc docker/Dockerfile
index a51e3046e,fc4442462..b0f5cc9e2
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -122,9 -121,9 +122,9 @@@ ADD http://205.177.226.237:9999/onosfw/
  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}/kingbird && pip install -e .
  RUN cd ${repos_dir}/moon/moonclient/ && python setup.py install
  
  RUN /bin/bash -c ". /etc/profile.d/rvm.sh \