From 68496bb60a5f478632caa68d37e916d73f82d13a Mon Sep 17 00:00:00 2001 From: "Fuel@OPNFV" Date: Thu, 12 Nov 2015 15:10:01 +0100 Subject: OPNFV qemu (KVM4NFV) plugin builder/installer. This plugin builder builds the KVM4NFV plugin such that it can be automatically deployed off-line (part of the .iso) READY TO MERGE verify: no-cache Change-Id: I1d4877c5fd83b4f4aee4432173edaf2a438406e3 Signed-off-by: Fuel@OPNFV --- build/f_isoroot/Makefile | 2 +- build/f_isoroot/f_qemupluginbuild/Makefile | 85 ++++++++++++++++++++++ build/f_isoroot/f_qemupluginbuild/config.mk | 12 +++ .../f_qemupluginbuild/config/qemu_config.yaml | 6 ++ 4 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 build/f_isoroot/f_qemupluginbuild/Makefile create mode 100644 build/f_isoroot/f_qemupluginbuild/config.mk create mode 100644 build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml (limited to 'build') diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 3831a09f0..626601b1b 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -8,7 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -SUBDIRS = f_kscfg f_bootstrap f_repobuild f_odlpluginbuild +SUBDIRS = f_kscfg f_bootstrap f_repobuild f_odlpluginbuild f_qemupluginbuild SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) .PHONY: all diff --git a/build/f_isoroot/f_qemupluginbuild/Makefile b/build/f_isoroot/f_qemupluginbuild/Makefile new file mode 100644 index 000000000..d815f0858 --- /dev/null +++ b/build/f_isoroot/f_qemupluginbuild/Makefile @@ -0,0 +1,85 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@eicsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +TOP := $(shell pwd) + +############################################################################ +# BEGIN of Include definitions +# +include config.mk +# +# END Include definitions +############################################################################# + +.PHONY: all +all: .qemubuild + +.PHONY: clean +clean: + @rm -f .qemubuild ../release/opnfv/fuel-plugin-qemu*.rpm fuel-plugin-qemu*.rpm + @rm -f $(BUILD_BASE)/gitinfo_qemu-plugin.txt gitinfo_qemu-plugin.txt + +.PHONY: release +release:.qemubuild + @rm -f ../release/opnfv/fuel-plugin-qemu*.rpm + @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 + git clone $(QEMU_REPO) + cd fuel-plugin-qemu; \ + git checkout $(QEMU_BRANCH); \ + if [ ! -z $(QEMU_CHANGE) ]; then \ + git fetch $(QEMU_REPO) $(QEMU_CHANGE); \ + git checkout FETCH_HEAD; \ + fi + INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-qemu/ + @mv fuel-plugin-qemu/fuel-plugin-qemu*.rpm . + $(REPOINFO) -r . > gitinfo_qemu-plugin.txt + @rm -rf fuel-plugin-qemu + @touch .qemubuild + +############################################################################# +# Cache operations - only used when building through ci/build.sh +############################################################################# + + +# Create a unique hash to be used for getting and putting cache, based on: +# - The SHA1 hash of the HEAD on the plugin repo's $(QEMU_BRANCH) +# - The contents of this Makefile +.cacheid: + @git ls-remote --heads $(QEMU_REPO) | grep $(QEMU_BRANCH) | awk {'print $$1'} > .cachedata + @sha1sum Makefile | awk {'print $$1'} >> .cachedata + @sha1sum config.mk | awk {'print $$1'} >> .cachedata + @cat .cachedata | $(CACHETOOL) getid > .cacheid + +# Clean local data related to caching - called prior to ordinary build +.PHONY: clean-cache +clean-cache: clean + @rm -f .cachedata .cacheid + +# Try to download cache - called prior to ordinary build +.PHONY: get-cache +get-cache: .cacheid + @if $(CACHETOOL) check $(shell cat .cacheid); then \ + $(CACHETOOL) get $(shell cat .cacheid) | tar xf -;\ + else \ + echo "No cache item found for $(shell cat .cacheid)" ;\ + exit 0;\ + fi + +# Store cache if not already stored - called after ordinary build +.PHONY: put-cache +put-cache: .cacheid + @tar cf - .qemubuild fuel-plugin-qemu*.rpm gitinfo_qemu-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk new file mode 100644 index 000000000..4344a5811 --- /dev/null +++ b/build/f_isoroot/f_qemupluginbuild/config.mk @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@eicsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +QEMU_BRANCH=63fb920a81bf62187c6c995ef7a52ddd877f33ba +QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu +QEMU_CHANGE= diff --git a/build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml b/build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml new file mode 100644 index 000000000..9e3b383d9 --- /dev/null +++ b/build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml @@ -0,0 +1,6 @@ +attributes: + metadata: + enabled: false + label: fuel-plugin-qemu + toggleable: true + weight: 70 -- cgit 1.2.3-korg