X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Ff_isoroot%2Ff_bgpvpn-pluginbuild%2FMakefile;h=a236b63b4559df424b0b2464f732ef7eb15cea7b;hb=refs%2Fheads%2Fstable%2Fdanube;hp=a99a426b6e536713d00a8e3d8e33b4ec8fc42a95;hpb=23e7333bb4e4ec228596d994bec18dc8d0670b2e;p=fuel.git

diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
index a99a426b6..a236b63b4 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -32,13 +32,15 @@ release:.bgpvpnbuild
 	@mkdir -p ../release/bgpvpn
 	@cp bgpvpn*.rpm ../release/opnfv/
 	cp gitinfo_bgpvpnplugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .bgpvpnbuild:
+	# The python packages build into deb by this plugin require a newer
+	# setuptools install a newer setuptools version until the container
+	# where this is run is bumped to ubuntu 16.04.
+	# --user is used because there is already a setuptools installation
+	#  managed by apt.
+	pip install setuptools --upgrade --user
 	rm -rf fuel-plugin-bgpvpn
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo gem install fpm
-	sudo pip install fuel-plugin-builder
 	git clone $(BGPVPN_REPO)
 	cd fuel-plugin-bgpvpn; \
 	git checkout $(BGPVPN_BRANCH); \
@@ -51,6 +53,9 @@ release:.bgpvpnbuild
 	$(REPOINFO) -r . > gitinfo_bgpvpnplugin.txt
 	rm -rf fuel-plugin-bgpvpn
 	touch .bgpvpnbuild
+	# 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
@@ -68,6 +73,7 @@ release:.bgpvpnbuild
 	fi
 	sha1sum Makefile >> .cachedata
 	sha1sum config.mk >> .cachedata
+	echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
 	cat .cachedata | $(CACHETOOL) getid > .cacheid
 
 # Clean local data related to caching - called prior to ordinary build