From 2ba9e1ad00f3ee22f9ae8d77e863a8915ff05cc0 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Tue, 5 Jan 2016 14:29:16 +0100 Subject: Integration of vsperf plugin VERIFIED READY TO MERGE Change-Id: Ia3b01c0de1081ce24e4db361ba6e77475e8ea291 Signed-off-by: Jonas Bjurel (cherry picked from commit bb22abb222dd0add134a4f911042422594e6f47b) --- build/f_isoroot/Makefile | 2 +- build/f_isoroot/f_vsperfpluginbuild/Makefile | 90 ++++++++++++++++++++++ build/f_isoroot/f_vsperfpluginbuild/config.mk | 12 +++ .../f_vsperfpluginbuild/config/qemu_config.yaml | 7 ++ 4 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 build/f_isoroot/f_vsperfpluginbuild/Makefile create mode 100644 build/f_isoroot/f_vsperfpluginbuild/config.mk create mode 100644 build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml (limited to 'build') diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 63f894b22..8f84b6a73 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -9,7 +9,7 @@ ############################################################################## # Add Fuel plugin build targets here -PLUGINS = f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild f_ovsnfv-dpdk-pluginbuild +PLUGINS = f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile new file mode 100644 index 000000000..ccf596a14 --- /dev/null +++ b/build/f_isoroot/f_vsperfpluginbuild/Makefile @@ -0,0 +1,90 @@ +############################################################################## +# 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: .vsperfbuild + +.PHONY: clean +clean: + @rm -f .vsperfbuild ../release/opnfv/fuel-plugin-vsperf*.rpm fuel-plugin-vsperf*.rpm + @rm -f $(BUILD_BASE)/gitinfo_vsperf-plugin.txt gitinfo_vsperf-plugin.txt + +.PHONY: release +release:.vsperfbuild + @rm -f ../release/opnfv/fuel-plugin-vsperf*.rpm + @mkdir -p ../release/opnfv + @cp fuel-plugin-vsperf*.rpm ../release/opnfv/ + cp gitinfo_vsperf-plugin.txt $(BUILD_BASE) + cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins + +.vsperfbuild: + @rm -rf fuel-plugin-vsperf + sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev + sudo pip install fuel-plugin-builder + ../../docker/ubuntu-builder/install_docker.sh + git clone $(VSPERF_REPO) + cd fuel-plugin-vsperf; \ + git checkout $(VSPERF_BRANCH); \ + if [ ! -z $(VSPERF_CHANGE) ]; then \ + git fetch $(VSPERF_REPO) $(VSPERF_CHANGE); \ + git checkout FETCH_HEAD; \ + fi + INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-vsperf/ + @mv fuel-plugin-vsperf/fuel-plugin-vsperf*.rpm . + $(REPOINFO) -r . > gitinfo_vsperf-plugin.txt + @rm -rf fuel-plugin-vsperf + @touch .vsperfbuild + +############################################################################# +# 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 $(VSPERF_BRANCH) +# - The contents of this Makefile +.cacheid: + @if [ ! -z $(VSPERF_CHANGE) ]; then \ + $(CACHETOOL) getcommitid $(VSPERF_REPO) $(VSPERF_CHANGE) > .cachedata; \ + else \ + $(CACHETOOL) getcommitid $(VSPERF_REPO) $(VSPERF_BRANCH) > .cachedata; \ + fi + @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 - .vsperfbuild fuel-plugin-vsperf*.rpm gitinfo_vsperf-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk new file mode 100644 index 000000000..df064680e --- /dev/null +++ b/build/f_isoroot/f_vsperfpluginbuild/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 +############################################################################## + +VSPERF_BRANCH=4256eef4e237ce9409d8cbffe9237f37a315d513 +VSPERF_REPO=https://github.com/billyom/fuel-plugin-vsperf.git +VSPERF_CHANGE= diff --git a/build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml b/build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml new file mode 100644 index 000000000..1dd28b54b --- /dev/null +++ b/build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml @@ -0,0 +1,7 @@ +attributes: + fuel-plugin-vsperf_text: + value: 'Set default value' + label: 'Text field' + description: 'Description for text field' + weight: 25 + type: "text" -- cgit 1.2.3-korg