Merge "Added environment sanity checks for build."

[fuel.git] / build / f_isoroot / f_odlpluginbuild / Makefile

diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index ba5a06b..36614a0 100644 (file)
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -8,7 +8,7 @@
 ##############################################################################
 
 TOP := $(shell pwd)
-ODL_BRANCH=7.0
+ODL_BRANCH=brahmaputra-release
 ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
 
 .PHONY: all
@@ -25,7 +25,6 @@ release:.odlbuild
        @mkdir -p ../release/opnfv
        @cp opendaylight*.rpm ../release/opnfv/
        cp gitinfo_odlplugin.txt $(BUILD_BASE)
-       cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 .odlbuild:
        rm -rf fuel-plugin-opendaylight
        sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
@@ -37,6 +36,9 @@ release:.odlbuild
        $(REPOINFO) -r . > gitinfo_odlplugin.txt
        rm -rf fuel-plugin-opendaylight
        touch .odlbuild
+       # 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