aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-10-31 12:36:09 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2015-11-28 13:07:52 +0100
commitd71f58e51755e99084107c1c8ada3321e2600002 (patch)
tree2c40cade1106c0b24f504f647532c4465c7ae537
parent68496bb60a5f478632caa68d37e916d73f82d13a (diff)
Plugin builder for OVS-NSH-DPDK
This plugin builder builds the OVS-NSH-DPDK plugin such that it can be automatically deployed off-line (part of the .iso) READY TO MERGE Change-Id: Ied8e0a8d01baea932acc5eb3398cec48e44d5c04 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile86
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk12
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml6
4 files changed, 105 insertions, 1 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 626601b1b..d0b8e0cd4 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
+SUBDIRS = f_kscfg f_bootstrap f_repobuild f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild
SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
.PHONY: all
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
new file mode 100644
index 000000000..ea95b67f2
--- /dev/null
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@ -0,0 +1,86 @@
+##############################################################################
+# 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: .ovsbuild
+
+.PHONY: clean
+clean:
+ @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs*.rpm fuel-plugin-ovs*.rpm
+ @rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt
+
+.PHONY: release
+release:.ovsbuild
+ @rm -f ../release/opnfv/fuel-plugin-ovs*.rpm
+ @mkdir -p ../release/opnfv
+ @cp fuel-plugin-ovs*.rpm ../release/opnfv/
+ cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
+ cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
+
+.ovsbuild:
+ @rm -rf fuel-plugin-ovs
+ 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 $(OVS_NSH_DPDK_REPO)
+ cd fuel-plugin-ovs; \
+ git checkout $(OVS_NSH_DPDK_BRANCH); \
+ if [ ! -z $(OVS_NSH_DPDK_CHANGE) ]; then \
+ git fetch $(OVS_NSH_DPDK_REPO) $(OVS_NSH_DPDK_CHANGE); \
+ git checkout FETCH_HEAD; \
+ fi
+ INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-ovs/
+ @mv fuel-plugin-ovs/fuel-plugin-ovs*.rpm .
+ $(REPOINFO) -r . > gitinfo_ovs-nsh-dpdk-plugin.txt
+ @rm -rf fuel-plugin-ovs
+ @touch .ovsbuild
+
+#############################################################################
+# 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 $(OVS_NSH_DPDK_BRANCH)
+# - The contents of this Makefile
+.cacheid:
+ @git ls-remote --heads $(OVS_NSH_DPDK_REPO) | grep $(OVS_NSH_DPDK_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 - .ovsbuild fuel-plugin-ovs*.rpm gitinfo_ovs-nsh-dpdk-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
new file mode 100644
index 000000000..3310b858d
--- /dev/null
+++ b/build/f_isoroot/f_ovs-nsh-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
+##############################################################################
+
+OVS_NSH_DPDK_BRANCH=373740ac0ad9de0c948edf7b4e35b86a8e6b2745
+OVS_NSH_DPDK_REPO=https://review.openstack.org/openstack/fuel-plugin-ovs
+OVS_NSH_DPDK_CHANGE=
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml
new file mode 100644
index 000000000..3943dbae4
--- /dev/null
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml
@@ -0,0 +1,6 @@
+attributes:
+ use_dpdk:
+ type: "checkbox"
+ weight: 20
+ value: false
+ label: "Use dpdk"