From ec0504dbebc5e3f9e29606f1995a0ad0b603bdad Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 24 Jan 2017 21:47:23 +0100 Subject: fuel-plugin-ovs: Rebase patches and enable for N JIRA: ARMBAND-203 Change-Id: I8c1ca9a10b62751509a37b0079d4e7040e53a60d Signed-off-by: Alexandru Avadanii --- ...003-build-docker-Use-host-s-network-stack.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch (limited to 'patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch') diff --git a/patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch b/patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch new file mode 100644 index 00000000..ea81a7b0 --- /dev/null +++ b/patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch @@ -0,0 +1,39 @@ +From: Alexandru Avadanii +Date: Thu, 15 Sep 2016 19:16:34 +0200 +Subject: [PATCH] build: docker: Use host's network stack + +Similar to Fuel@OPNFV build process, we want to mount /etc/hosts +in the builder container to be able to use local mirror caches. + +Signed-off-by: Alexandru Avadanii +--- + pre_build_hook | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/pre_build_hook b/pre_build_hook +index 0c27358..30ca109 100755 +--- a/pre_build_hook ++++ b/pre_build_hook +@@ -26,16 +26,19 @@ function build_pkg { + + DEB_DIR=${DIR}/deb-ovs-dpdk + rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; +- sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh ++ sudo docker run -v ${DEB_DIR}:/deb -v /etc/hosts:/etc/hosts \ ++ -t ovs_build /ovs_build/build-ovs-dpdk.sh + cp -r ${DEB_DIR}/* ${DIR}/repositories/ubuntu/ + + rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; +- sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh ++ sudo docker run -v ${DEB_DIR}:/deb -v /etc/hosts:/etc/hosts \ ++ -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh + cp -r ${DEB_DIR}/* ${DIR}/repositories/ubuntu/ + + rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; + sudo docker run -e "UBUNTU_ARCH=${UBUNTU_ARCH}" -e "BUILD_ARCH=${BUILD_ARCH}" \ +- -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/prebuilt-ovs-fetch.sh ++ -v ${DEB_DIR}:/deb -v /etc/hosts:/etc/hosts \ ++ -t ovs_build /ovs_build/prebuilt-ovs-fetch.sh + cp -r ${DEB_DIR}/* ${DIR}/repositories/ubuntu/ + rm -rf ${DEB_DIR} + -- cgit 1.2.3-korg