From 4294e875a20fda54e6a4fdf72d5850cd21860f22 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Fri, 27 Nov 2015 14:57:07 +0100 Subject: ONOSFW SDN support Implements a plugin builder for the ONOSFW Fuel plugin. TODO: - Naildown upstream plug-in to a specific tag/commit-id NOT VERIFIED DO NOT MERGE JIRA: FUEL-56 Change-Id: I7c1a60446593ec860fc87a51255242388044e254 Signed-off-by: Jonas Bjurel --- build/f_isoroot/Makefile | 2 +- build/f_isoroot/f_onosfwpluginbuild/Makefile | 85 ++++++++++++++++++++++ build/f_isoroot/f_onosfwpluginbuild/config.mk | 12 +++ .../f_onosfwpluginbuild/config/onosfw_config.yaml | 5 ++ 4 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 build/f_isoroot/f_onosfwpluginbuild/Makefile create mode 100644 build/f_isoroot/f_onosfwpluginbuild/config.mk create mode 100644 build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml (limited to 'build') diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index d0b8e0cd4..84c17c0e3 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 f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild +SUBDIRS = f_kscfg f_bootstrap f_repobuild f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) .PHONY: all diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile new file mode 100644 index 000000000..8e8ce39ae --- /dev/null +++ b/build/f_isoroot/f_onosfwpluginbuild/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: .onosbuild + +.PHONY: clean +clean: + @rm -f .onosbuild ../release/opnfv/onos*.rpm onos*.rpm + @rm -f $(BUILD_BASE)/gitinfo_onos-plugin.txt gitinfo_onos-plugin.txt + +.PHONY: release +release:.onosbuild + @rm -f ../release/opnfv/onos*.rpm + @mkdir -p ../release/opnfv + @cp onos*.rpm ../release/opnfv/ + cp gitinfo_onos-plugin.txt $(BUILD_BASE) + cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins + +.onosbuild: + @rm -rf fuel-plugin-onos + 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 $(ONOS_REPO) + cd fuel-plugin-onos; \ + git checkout $(ONOS_BRANCH); \ + if [ ! -z $(ONOS_CHANGE) ]; then \ + git fetch $(ONOS_REPO) $(ONOS_CHANGE); \ + git checkout FETCH_HEAD; \ + fi + INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-onos/ + @mv fuel-plugin-onos/onos*.rpm . + $(REPOINFO) -r . > gitinfo_onos-plugin.txt + @rm -rf fuel-plugin-onos + @touch .onosbuild + +############################################################################# +# 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 $(ONOS_BRANCH) +# - The contents of this Makefile +.cacheid: + @git ls-remote --heads $(ONOS_REPO) | grep $(ONOS_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 - .onosbuild onos*.rpm gitinfo_onos-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk new file mode 100644 index 000000000..930fe9782 --- /dev/null +++ b/build/f_isoroot/f_onosfwpluginbuild/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 +############################################################################## + +ONOS_BRANCH=master +ONOS_REPO=https://review.openstack.org/openstack/fuel-plugin-onos +ONOS_CHANGE=refs/changes/02/250802/1 diff --git a/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml b/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml new file mode 100644 index 000000000..17d7e5d42 --- /dev/null +++ b/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml @@ -0,0 +1,5 @@ +attributes: + metadata: + restrictions: + - "cluster:net_provider != 'neutron'": "Neutron only" + -- cgit 1.2.3-korg