Rebase of ks.cfg due to upstream changes

[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 a63cdad..024cd4a 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
@@ -32,12 +32,15 @@ release:.odlbuild
        sudo gem install fpm
        sudo pip install fuel-plugin-builder
        git clone -b $(ODL_BRANCH) $(ODL_REPO)
-       @$(BUILD_BASE)/check_dependencies.sh fuel-plugin-opendaylight/odl_package/ubuntu/dependencies.txt
-       INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-opendaylight/
+       # Temporary location of working Be snapshot
+       ODL_TARBALL_LOCATION=http://devel.opt.im/distribution-karaf-0.4.0-20160118.091622-3555.tar.gz fpb --debug --build fuel-plugin-opendaylight/
        mv fuel-plugin-opendaylight/opendaylight*.rpm .
        $(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
@@ -48,7 +51,7 @@ release:.odlbuild
 #   - The SHA1 hash of the HEAD on the plugin repo's $(ODL_BRANCH)
 #   - The contents of this Makefile
 .cacheid:
-       git ls-remote --heads $(ODL_REPO) | grep $(ODL_BRANCH) > .cachedata
+       @$(CACHETOOL) getcommitid $(ODL_REPO) $(ODL_BRANCH) > .cachedata
        sha1sum Makefile >> .cachedata
        cat .cachedata | $(CACHETOOL) getid > .cacheid