summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile.aarch64
diff options
context:
space:
mode:
authorjoehuang <joehuang@huawei.com>2017-02-17 22:24:51 -0500
committerjoehuang <joehuang@huawei.com>2017-02-21 21:49:48 -0500
commit8320c9765308e2dbbc4e1e839e4bf5f5691c604d (patch)
tree2b28b029e6acb19b8b3f6eeae98504d21d89f3aa /docker/Dockerfile.aarch64
parent3a3968850a0c37ef0734919b03c6bcdc309b3628 (diff)
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>
Diffstat (limited to 'docker/Dockerfile.aarch64')
-rw-r--r--docker/Dockerfile.aarch646
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index d1c44e334..064d3c3f4 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 \