From: Emma Foley <efoley@redhat.com>
Date: Wed, 20 May 2020 18:55:10 +0000 (-0400)
Subject: Update collectd container to use 5.11
X-Git-Tag: opnfv-10.0.0~16^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=87969f4012234e47f91c731444ab03f4c45da880;p=barometer.git

Update collectd container to use 5.11

Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: I1867ec05011a58b16a0d88bd9bd3fdfd7ac5d2e3
---

diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh
index 1eb6f8d2..30b73852 100755
--- a/ci/utility/package-list.sh
+++ b/ci/utility/package-list.sh
@@ -25,4 +25,4 @@ CMTCAT_BRANCH=8b27ad757e86a01bc51eafcb9e600605ff1beca4
 CMTCAT_VERSION="v1.1.0"
 
 COLLECTD_REPO=https://github.com/collectd/collectd.git
-COLLECTD_BRANCH=collectd-5.10
+COLLECTD_BRANCH=collectd-5.11
diff --git a/docker/barometer-influxdb/Dockerfile b/docker/barometer-influxdb/Dockerfile
index f84b22d7..5a640c2b 100644
--- a/docker/barometer-influxdb/Dockerfile
+++ b/docker/barometer-influxdb/Dockerfile
@@ -15,5 +15,5 @@
 
 FROM influxdb:1.3.7
 
-RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.10/src/types.db -O /types.db
+RUN wget https://raw.githubusercontent.com/collectd/collectd/collectd-5.11/src/types.db -O /types.db
 COPY ./influxdb.conf /etc/influxdb/influxdb.conf
diff --git a/src/package-list.mk b/src/package-list.mk
index d5fedf73..a5c7bcf9 100644
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -27,7 +27,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd
 #                   set pull requests with experimental features
 ifeq ($(COLLECTD_FLAVOR), stable)
 # using latest stable release
-	COLLECTD_TAG ?= collectd-5.10
+	COLLECTD_TAG ?= collectd-5.11
 	SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
 else
 # 'master' and 'experimental' collectd flavors are both using