From 93812ede1ee0e6a42455ea89ee277a92147ed730 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Sun, 14 Feb 2016 14:21:37 +0100 Subject: Fixed deployment timeout and OVSNFV plugin build - Increase deployment timeout to 4h since some deplyments takes more than 3h (KVM) - Fixed build interference between OVSNFV and OVS-NSH where the later removed the OVSNFV build result from release/opnfv. A propper fix for SR2 is to have f_isoroot/Makefile remove the release directory before build, and not have the plugins removing anythin in release Change-Id: Ibca986554087d6a7f12ed8c7cc6fdd4919368ad2 Signed-off-by: Jonas Bjurel (cherry picked from commit 18d8b0bc95af3ea0ed02717af65dd4656fac8830) --- build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile | 4 ++-- build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'build/f_isoroot') diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile index b4844b420..5e38b4c53 100644 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile @@ -22,12 +22,12 @@ all: .ovsbuild .PHONY: clean clean: - @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs*.rpm fuel-plugin-ovs*.rpm + @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs-*.rpm fuel-plugin-ovs-*.rpm @rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt .PHONY: release release:.ovsbuild - @rm -f ../release/opnfv/fuel-plugin-ovs*.rpm + @rm -f ../release/opnfv/fuel-plugin-ovs-*.rpm @mkdir -p ../release/opnfv @cp fuel-plugin-ovs*.rpm ../release/opnfv/ cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE) diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile index 6bc5769a5..4ca5236a0 100644 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile @@ -22,18 +22,18 @@ all: .ovsnfvbuild .PHONY: clean clean: - @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv*.rpm fuel-plugin-ovsnfv*.rpm + @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv-*.rpm fuel-plugin-ovsnfv-*.rpm @rm -f $(BUILD_BASE)/gitinfo_ovsnfv-dpdk-plugin.txt gitinfo_ovsnfv-dpdk-plugin.txt .PHONY: release release:.ovsnfvbuild - @rm -f ../release/opnfv/fuel-plugin-ovsnfv*.rpm + @rm -f ../release/opnfv/fuel-plugin-ovsnfv-*.rpm @mkdir -p ../release/opnfv @cp fuel-plugin-ovsnfv*.rpm ../release/opnfv/ cp gitinfo_ovsnfv-dpdk-plugin.txt $(BUILD_BASE) .ovsnfvbuild: - @rm -rf fuel-plugin-ovsnfv + @rm -rf ovsnfv sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev sudo pip install fuel-plugin-builder git clone $(OVSNFV_DPDK_REPO) ovsnfv @@ -47,7 +47,7 @@ release:.ovsnfvbuild INCLUDE_DEPENDENCIES=true fpb --debug --build $(OVSNFV_DPDK_DIR) @mv ovsnfv/$(OVSNFV_DPDK_DIR)/fuel-plugin-ovsnfv*.rpm . $(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt - @rm -rf fuel-plugin-ovsnfv + @rm -rf ovsnfv @touch .ovsnfvbuild # Store artifact in cache straight away if caching is enabled # (no .cacheid will be present unless this is a cached build) -- cgit 1.2.3-korg