build and deploy onos plugin for fuel9

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

diff --git a/build/f_isoroot/f_qemupluginbuild/Makefile b/build/f_isoroot/f_qemupluginbuild/Makefile
index 19a2337..2e3a34f 100644 (file)
--- a/build/f_isoroot/f_qemupluginbuild/Makefile
+++ b/build/f_isoroot/f_qemupluginbuild/Makefile
@@ -31,13 +31,12 @@ release:.qemubuild
        @mkdir -p ../release/opnfv
        @cp fuel-plugin-qemu*.rpm ../release/opnfv/
        cp gitinfo_qemu-plugin.txt $(BUILD_BASE)
-       cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .qemubuild:
        @rm -rf fuel-plugin-qemu
        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 $(QEMU_REPO)
        cd fuel-plugin-qemu; \
        git checkout $(QEMU_BRANCH); \
@@ -50,6 +49,9 @@ release:.qemubuild
        $(REPOINFO) -r . > gitinfo_qemu-plugin.txt
        @rm -rf fuel-plugin-qemu
        @touch .qemubuild
+       # 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