Applying ODL changes to BGPVPN scenario

[fuel.git] / build / f_isoroot / f_bgpvpn-pluginbuild / Makefile

diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
index 3da8d38..24fa178 100644 (file)
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -32,7 +32,6 @@ 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:
        rm -rf fuel-plugin-bgpvpn
@@ -51,6 +50,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
@@ -61,7 +63,7 @@ release:.bgpvpnbuild
 #   - The SHA1 hash of the HEAD on the plugin repo's $(BGPVPN_BRANCH)
 #   - The contents of this Makefile
 .cacheid:
-       if [ ! -z $(BGPVPN_CHANGE) ]; then \
+       @if [ ! -z $(BGPVPN_CHANGE) ]; then \
          $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_CHANGE) > .cachedata; \
        else \
          $(CACHETOOL) getcommitid $(BGPVPN_REPO) $(BGPVPN_BRANCH) > .cachedata; \