diff options
| author |   Kamil Wiatrowski <kamilx.wiatrowski@intel.com> | 2019-01-11 07:58:03 +0000 |
|---|---|---|
| committer | Kamil Wiatrowski <kamilx.wiatrowski@intel.com> | 2019-05-07 17:00:41 +0200 |
| commit | 48bd4b945262edf8558abd9c0dacdd18fe8ef84b (patch) | |
| tree | 9ebcb1b74d50d6e39ccbb79793d14b653960ddf1 /src/package-list.mk | |
| parent | 4d11ca17d0f73f5bd783f45900118295fdfed46b (diff) | |
docker: Add support for experimental collectd container
Experimental container is based on master branch and includes
set of pull requests with experimental features.
By default one addtional PR is included - logparser.
Change-Id: I455122b23b6de382f6ef75a790f7b052784b59ac
Signed-off-by: Radoslaw Jablonski <radoslawx.jablonski@intel.com>
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
Diffstat (limited to 'src/package-list.mk')
| -rw-r--r-- | src/package-list.mk | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/package-list.mk b/src/package-list.mk index b58e092a..47b90bde 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -19,13 +19,26 @@ KAFKA_TAG ?= v0.9.5 # collectd section COLLECTD_URL ?= https://github.com/collectd/collectd -# there are 2 collectd flavors: -# -"collectd" - based on stable collect release -# -"collectd-master" - development version, based on master branch -ifdef COLLECTD_USE_MASTER - COLLECTD_TAG ?= master -else + +# there are 3 collectd flavors: +# -"stable" - based on stable collectd release +# -"master" - development version, based on master branch +# -"experimental" - it is based on master branch as above and includes +# set pull requests with experimental features +ifeq ($(COLLECTD_FLAVOR), stable) +# using latest stable release COLLECTD_TAG ?= collectd-5.8 + SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs +else +# 'master' and 'experimental' collectd flavors are both using +# code from master branch + COLLECTD_TAG ?= master + SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master +ifeq ($(COLLECTD_FLAVOR), experimental) +# 'experimental' flavor is using additional Pull Requests that +# are put on top of master release + COLLECTD_USE_EXPERIMENTAL_PR ?= y +endif #end of experimental-branch handling endif COLLECTD_OPENSTACK_URL ?= https://github.com/openstack/collectd-openstack-plugins |