summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-07-14 08:13:32 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-14 08:13:32 +0000
commitdfda6c2155a647bd78467c6cc8926c5d9c3a3234 (patch)
treebfebe9821ac484629a804e81d7dbdb19da20f570
parent3647eb632066358736b55cd79a799e1a20a8e38e (diff)
parent50b6b5f994a96ca726d4cb34c714f778a99fc3c8 (diff)
Merge "Add fuel collectd ceilometer plugin"
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile90
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk13
3 files changed, 104 insertions, 1 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 51b8f26fa..4df7bcb0c 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
# Add Fuel plugin build targets here
# Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have
# verified it!
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild
#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
export PLUGINS
#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
new file mode 100644
index 000000000..9ab922d2d
--- /dev/null
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
@@ -0,0 +1,90 @@
+##############################################################################
+# Copyright (c) 2016 Ericsson AB and others.
+# jonas.bjurel@eicsson.com
+# ruijing.guo@intel.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: .fastpathmetrics
+
+.PHONY: clean
+clean:
+ @rm -f .fastpathmetrics ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm fuel-plugin-collectd-ceilometer-*.rpm
+ @rm -f $(BUILD_BASE)/gitinfo_collectd-ceilometer-plugin.txt gitinfo_collectd-ceilometer-plugin.txt
+
+.PHONY: release
+release:.fastpathmetrics
+ @rm -f ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm
+ @mkdir -p ../release/opnfv
+ @cp fuel-plugin-collectd-ceilometer*.rpm ../release/opnfv/
+ cp gitinfo_collectd-ceilometer-plugin.txt $(BUILD_BASE)
+
+.fastpathmetrics:
+ @rm -rf fastpathmetrics
+ git clone $(COLLECTD_CEILOMETER_REPO)
+ cd fastpathmetrics; \
+ git checkout $(COLLECTD_CEILOMETER_BRANCH); \
+ if [ ! -z $(COLLECTD_CEILOMETER_CHANGE) ]; then \
+ git fetch $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_CHANGE); \
+ git checkout FETCH_HEAD; \
+ fi
+ fpb --debug --build fastpathmetrics/src/fuel-plugin
+ @mv fastpathmetrics/src/fuel-plugin/fuel-plugin-collectd-ceilometer*.rpm .
+ $(REPOINFO) -r . > gitinfo_collectd-ceilometer-plugin.txt
+ @rm -rf fastpathmetrics
+ @touch .fastpathmetrics
+ # Store artifact in cache straight away if caching is enabled
+ # (no .cacheid will be present unless this is a cached build)
+ test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
+
+#############################################################################
+# 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 $(COLLECTD_CEILOMETER_BRANCH)
+# - The contents of this Makefile
+.cacheid:
+ @if [ ! -z $(COLLECTD_CEILOMETER_CHANGE) ]; then \
+ $(CACHETOOL) getcommitid $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_CHANGE) > .cachedata; \
+ else \
+ $(CACHETOOL) getcommitid $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_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 - .fastpathmetrics fuel-plugin-collectd-ceilometer*.rpm gitinfo_collectd-ceilometer-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
new file mode 100644
index 000000000..2baf67d18
--- /dev/null
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
@@ -0,0 +1,13 @@
+##############################################################################
+# Copyright (c) 2016 Ericsson AB and others.
+# jonas.bjurel@eicsson.com
+# ruijing.guo@intel.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
+##############################################################################
+
+COLLECTD_CEILOMETER_BRANCH?=6a0837238ff13d3294e5a7181fc3de40e3094625
+COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/fastpathmetrics
+COLLECTD_CEILOMETER_CHANGE?=