diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-04-21 14:37:13 +0100 |
|---|---|---|
| committer | Emma Foley <efoley@redhat.com> | 2021-06-03 13:28:36 +0100 |
| commit | d49c6ba0cc7f5892c65c67afdaa1ee77ce3aa182 (patch) | |
| tree | 15a032995fcad631b8733c2394938de61bcf5e2b /src/package-list.mk | |
| parent | 28517f841a3261987114869e04624cdd686c31a5 (diff) | |
[docker] Add collectd-6
* Add instruction to docs/ for using
docker/barometer-collectd-experimental/Dockerfile to build collectd
version 6
* Add a new COLLECTD_FLAVOR to src/collectd/Makefile to configure
tags for a collectd 6 build.
* Allow passing COLLECTD_CONFIG_CMD_ARGS to the collectd build
For testing with new plugins for collectd-6, as un-ported plugins are
disabled by default.
This new option lets the ./configure command be run with extra args,
e.g. --enable-cpu --enable-<my-newly-ported-plugin>, which means that
plugin can be enabled for the PR that is being tested.
* Update flavor_image_name selection to include collectd-6
Change-Id: I55ee0bbcb5d89357b1ef11ab17c5b029603ecdf7
Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'src/package-list.mk')
| -rw-r--r-- | src/package-list.mk | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/package-list.mk b/src/package-list.mk index 59e9a0a2..b27cd575 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -20,23 +20,35 @@ KAFKA_TAG ?= v1.5.2 # collectd section COLLECTD_URL ?= https://github.com/collectd/collectd -# there are 3 collectd flavors: +# there are 4 collectd flavors: # -"stable" - based on stable collectd release # -"latest" - development version, based on main branch # -"experimental" - it is based on main branch as above and includes # set pull requests with experimental features +# -"collectd-6" - based on the collectd 6.0 branch ifeq ($(COLLECTD_FLAVOR), stable) -# using latest stable release +# using the most recent stable release COLLECTD_TAG ?= collectd-5.12 SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs -else -# 'latest' and 'experimental' collectd flavors are both using -# code from main branch +endif +ifeq ($(COLLECTD_FLAVOR), latest) +# collectd code from main branch COLLECTD_TAG ?= main SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest +endif ifeq ($(COLLECTD_FLAVOR), experimental) # 'experimental' flavor is using additional Pull Requests that # are put on top of main release + COLLECTD_TAG ?= main + SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest COLLECTD_USE_EXPERIMENTAL_PR ?= y endif #end of experimental-branch handling -endif +ifeq ($(COLLECTD_FLAVOR), collectd-6) +# 'collectd-6' flavor is using collectd-6.0 branch + COLLECTD_TAG ?= collectd-6.0 + SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest + COLLECTD_USE_EXPERIMENTAL_PR ?= y +endif #end of collectd-6.0-branch handling + +@echo "Using COLLECTD_TAG: $(COLLECTD_TAG)" +@echo "Using SAMPLE_CONF_VARIANT_NAME: $(SAMPLE_CONF_VARIANT_NAME)" |