X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Ff_isoroot%2Ff_ovs-nsh-dpdk-pluginbuild%2FMakefile;h=5e38b4c531eebd5ec511195af9f7fcb08061d504;hb=93812ede1ee0e6a42455ea89ee277a92147ed730;hp=89af75b9221f17a19d9b88e6908cc73b2e121025;hpb=23e7333bb4e4ec228596d994bec18dc8d0670b2e;p=fuel.git

diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index 89af75b92..5e38b4c53 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@ -22,22 +22,21 @@ 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)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .ovsbuild:
 	@rm -rf fuel-plugin-ovs
 	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
 	sudo pip install fuel-plugin-builder
-	./install_docker.sh
+	../../docker/ubuntu-builder/install_docker.sh
 	git clone $(OVS_NSH_DPDK_REPO)
 	cd fuel-plugin-ovs; \
 	git checkout $(OVS_NSH_DPDK_BRANCH); \
@@ -50,6 +49,9 @@ release:.ovsbuild
 	$(REPOINFO) -r . > gitinfo_ovs-nsh-dpdk-plugin.txt
 	@rm -rf fuel-plugin-ovs
 	@touch .ovsbuild
+	# Store artifact in cache straight away if caching is enabled
+	# (no .cacheid will be present unless this is a cached build)
+	test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
 
 #############################################################################
 # Cache operations - only used when building through ci/build.sh