diff options
4 files changed, 109 insertions, 1 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 012e71e65..63f894b22 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 +PLUGINS = f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild f_ovsnfv-dpdk-pluginbuild # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile new file mode 100644 index 000000000..6b76fbe50 --- /dev/null +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile @@ -0,0 +1,89 @@ +############################################################################## +# 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: .ovsnfvbuild + +.PHONY: clean +clean: + @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv*.rpm fuel-plugin-ovsnfv*.rpm + @rm -f $(BUILD_BASE)/gitinfo_ovsnfv-dpdk-plugin.txt gitinfo_ovsnfv-dpdk-plugin.txt + +.PHONY: release +release:.ovsnfvbuild + @rm -f ../release/opnfv/fuel-plugin-ovsnfv*.rpm + @mkdir -p ../release/opnfv + @cp fuel-plugin-ovsnfv*.rpm ../release/opnfv/ + cp gitinfo_ovsnfv-dpdk-plugin.txt $(BUILD_BASE) + cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins + +.ovsnfvbuild: + @rm -rf fuel-plugin-ovsnfv + 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 $(OVSNFV_DPDK_REPO) + cd fuel-plugin-ovsnfv; \ + git checkout $(OVSNFV_DPDK_BRANCH); \ + if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \ + git fetch $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE); \ + git checkout FETCH_HEAD; \ + fi + INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-ovsnfv/ + @mv fuel-plugin-ovsnfv/fuel-plugin-ovsnfv*.rpm . + $(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt + @rm -rf fuel-plugin-ovsnfv + @touch .ovsnfvbuild + +############################################################################# +# 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 $(OVSNFV_DPDK_BRANCH) +# - The contents of this Makefile +.cacheid: + @if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \ + $(CACHETOOL) getcommitid $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE) > .cachedata; \ + else \ + $(CACHETOOL) getcommitid $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_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 - .ovsnfvbuild fuel-plugin-ovsnfv*.rpm gitinfo_ovsnfv-dpdk-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk new file mode 100644 index 000000000..cfaa4f723 --- /dev/null +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/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 +############################################################################## + +OVSNFV_DPDK_BRANCH=d13417a93c4df1d4db8f86f23ae4d42a056b5de8 +OVSNFV_DPDK_REPO=https://github.com/mrmarkgray/fuel-plugin-ovsnfv +OVSNFV_DPDK_CHANGE= diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml new file mode 100644 index 000000000..947e22502 --- /dev/null +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml @@ -0,0 +1,7 @@ +attributes: + fuel-plugin-ovsnfv_text: + value: 'Set default value' + label: 'Text field' + description: 'Description for text field' + weight: 25 + type: "text" |