From fcccd8c861fac29a05155cc9e634a8d2af157a69 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Thu, 10 Dec 2015 20:59:52 +0100 Subject: Integration of ODL BGP-VPN plugin READY TO MERGE JIRA: FUEL-48 Change-Id: Idc44966f32caf8728580bac8bcc89981f7c987ba Signed-off-by: Jonas Bjurel --- build/f_isoroot/Makefile | 2 +- build/f_isoroot/f_bgpvpn-pluginbuild/Makefile | 87 ++++++++++++++++++++++ build/f_isoroot/f_bgpvpn-pluginbuild/config.mk | 12 +++ .../f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml | 6 ++ 4 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 build/f_isoroot/f_bgpvpn-pluginbuild/Makefile create mode 100644 build/f_isoroot/f_bgpvpn-pluginbuild/config.mk create mode 100644 build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index a03134156..012e71e65 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 +PLUGINS = f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile new file mode 100644 index 000000000..443a8e39c --- /dev/null +++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile @@ -0,0 +1,87 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.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: .bgpvpnbuild + +.PHONY: clean +clean: + @rm -f .bgpvpnbuild ../release/opnfv/bgpvpn*.rpm bgpvpn*.rpm + @rm -f $(BUILD_BASE)/gitinfo_bgpvpnplugin.txt gitinfo_bgpvpnplugin.txt + +.PHONY: release +release:.bgpvpnbuild + @rm -f ../release/opnfv/bgpvpn*.rpm + @mkdir -p ../release/bgpvpn + @cp bgpvpn*.rpm ../release/opnfv/ + cp gitinfo_bgpvpnplugin.txt $(BUILD_BASE) + cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins + +.bgpvpnbuild: + rm -rf fuel-plugin-bgpvpn + sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev + sudo gem install fpm + sudo pip install fuel-plugin-builder + git clone $(BGPVPN_REPO) + cd fuel-plugin-bgpvpn; \ + git checkout $(BGPVPN_BRANCH); \ + if [ ! -z $(BGPVPN_CHANGE) ]; then \ + git fetch $(BGPVPN_REPO) $(BGPVPN_CHANGE); \ + git checkout FETCH_HEAD; \ + fi + fpb --debug --build fuel-plugin-bgpvpn/ + mv fuel-plugin-bgpvpn/bgpvpn*.rpm . + $(REPOINFO) -r . > gitinfo_bgpvpnplugin.txt + rm -rf fuel-plugin-bgpvpn + touch .bgpvpnbuild + +############################################################################# +# 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 $(BGPVPN_BRANCH) +# - The contents of this Makefile +.cacheid: + git ls-remote --heads $(BGPVPN_REPO) | grep $(BGPVPN_BRANCH) > .cachedata + sha1sum Makefile >> .cachedata + sha1sum config.mk >> .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 - .bgpvpnbuild bgpvpn*.rpm gitinfo_bgpvpnplugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk new file mode 100644 index 000000000..19f76d690 --- /dev/null +++ b/build/f_isoroot/f_bgpvpn-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 +############################################################################## + +BGPVPN_BRANCH=32e4b36fa2d37dabb53cc3ee71960e2162f64a43 +BGPVPN_REPO="https://github.com/openstack/fuel-plugin-bgpvpn.git" +BGPVPN_CHANGE= diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml b/build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml new file mode 100644 index 000000000..50870a179 --- /dev/null +++ b/build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml @@ -0,0 +1,6 @@ +attributes: + metadata: + restrictions: + - "cluster:net_provider != 'neutron'": "Only neutron is supported by BGPVPN-plugin" + label: "BGPVPN plugin" + weight: 90 -- cgit 1.2.3-korg