From: joehuang <joehuang@huawei.com>
Date: Sat, 18 Feb 2017 03:24:51 +0000 (-0500)
Subject: Restore Kingbird functest
X-Git-Tag: 0.2~879^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8320c9765308e2dbbc4e1e839e4bf5f5691c604d;p=functest-xtesting.git

Restore Kingbird functest

Kingbird functest was excluded from Functest due to python client
dependency conflict. But in Functest container, the kingbird was
installed only for tempest plugin descovery and execution of tempest
test cases. It's safe to restore kingbird installation in the Dockerfile
now.

The kingbird installation works after the functest container image
was built.

Change-Id: I44593dcf47dd1deed2f6a94b7e801230bae9b251
Signed-off-by: joehuang <joehuang@huawei.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 13f43dd4..bce29ee9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -90,7 +90,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${REPOS_DIR}/rele
 
 # OpenStack repositories
 RUN git clone --depth 1 -b $OPENSTACK_TAG https://github.com/openstack/networking-bgpvpn ${REPOS_DIR}/bgpvpn
-#RUN git clone --depth 1 -b $KINGBIRD_TAG https://github.com/openstack/kingbird.git ${REPOS_DIR}/kingbird
+RUN git clone --depth 1 -b $KINGBIRD_TAG https://github.com/openstack/kingbird.git ${REPOS_DIR}/kingbird
 RUN git clone --depth 1 -b $RALLY_TAG https://github.com/openstack/rally.git ${REPOS_DIR}/rally
 RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest
 
@@ -135,7 +135,9 @@ RUN cd ${REPOS_DIR}/sfc && pip install .
 RUN cd ${REPOS_DIR}/sdnvpn && pip install .
 
 RUN cd ${REPOS_DIR}/bgpvpn && pip install .
-#RUN cd ${REPOS_DIR}/kingbird && pip install -e .
+
+# Kingbird integration
+RUN cd ${REPOS_DIR}/kingbird && pip install -e .
 
 RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
     && cd ${REPOS_VNFS_DIR}/vims-test \
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index d1c44e33..064d3c3f 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -90,7 +90,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${REPOS_DIR}/rele
 
 # OpenStack repositories
 RUN git clone --depth 1 -b $OPENSTACK_TAG https://github.com/openstack/networking-bgpvpn ${REPOS_DIR}/bgpvpn
-#RUN git clone --depth 1 -b $KINGBIRD_TAG https://github.com/openstack/kingbird.git ${REPOS_DIR}/kingbird
+RUN git clone --depth 1 -b $KINGBIRD_TAG https://github.com/openstack/kingbird.git ${REPOS_DIR}/kingbird
 RUN git clone --depth 1 -b $RALLY_TAG https://github.com/openstack/rally.git ${REPOS_DIR}/rally
 RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest
 
@@ -131,7 +131,9 @@ RUN cd ${REPOS_DIR}/sfc && pip install .
 RUN cd ${REPOS_DIR}/sdnvpn && pip install .
 
 RUN cd ${REPOS_DIR}/bgpvpn && pip install .
-#RUN cd ${REPOS_DIR}/kingbird && pip install -e .
+
+# Kingbird integration
+RUN cd ${REPOS_DIR}/kingbird && pip install -e .
 
 RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
     && cd ${REPOS_VNFS_DIR}/vims-test \