diff options
author | Matthias Runge <mrunge@redhat.com> | 2019-05-08 11:55:38 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-05-08 11:55:38 +0000 |
commit | d9737cbfef39c0f45fa21c7fc28035039c9d17a6 (patch) | |
tree | ad74a4ce61d1428be8163652637af2aa58ec9b28 /src/package-list.mk | |
parent | 46832aaa20b6ca7963e7230928d329383687c56e (diff) | |
parent | 48bd4b945262edf8558abd9c0dacdd18fe8ef84b (diff) |
Merge "docker: Add support for experimental collectd container"
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 |