From d08abfe33ea3e2206d751de9aaa1a3b781696d81 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Wed, 9 Oct 2019 20:53:38 +0000
Subject: [PATCH] testing/telegraf: upgrade to 1.12.3
---
testing/telegraf/APKBUILD | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/testing/telegraf/APKBUILD b/testing/telegraf/APKBUILD
index 8aadf55615ad..de130f904da9 100644
--- a/testing/telegraf/APKBUILD
+++ b/testing/telegraf/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Katie Holly <holly@fuslvz.ws>
# Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
pkgname=telegraf
-pkgver=1.12.2
+pkgver=1.12.3
pkgrel=0
pkgdesc="A plugin-driven server agent for collecting & reporting metrics, part of the InfluxDB project"
url="https://www.influxdata.com/time-series-platform/telegraf/"
@@ -11,7 +11,7 @@ license="MIT"
makedepends="go dep binutils-gold"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/influxdata/$pkgname/archive/$pkgver.tar.gz
+source="telegraf-$pkgver.tar.gz::https://github.com/influxdata/telegraf/archive/$pkgver.tar.gz
telegraf.initd
telegraf.confd
"
@@ -23,7 +23,7 @@ export GOTMPDIR=${GOTMPDIR:-$srcdir}
prepare() {
mkdir -p ${builddir%/*}
- mv "$srcdir"/$pkgname-$pkgver "$builddir"/ || return 1
+ mv "$srcdir"/$pkgname-$pkgver "$builddir"/
cd "$builddir"
dep ensure -v
default_prepare
@@ -36,9 +36,11 @@ build() {
check() {
# filecount tests are excluded because they depend on exact file sizes
# which depend on filesystem used.
+ # http_response querying nonexistent.nonexistent on aarch64 drone ci
+ # fails with timeout, but works on all other archs.
# Prometheus tls test depends on specific bytes returned by http server,
# disabling tls13 workarounds test failure for now.
- GODEBUG=tls13=0 go test -short $(go list ./... | grep -v plugins/inputs/filecount)
+ GODEBUG=tls13=0 go test -short $(go list ./... | egrep -v '(plugins/inputs/filecount)|(plugins/inputs/http_response)')
}
package() {
@@ -49,6 +51,6 @@ package() {
install -dm755 "$pkgdir/etc/$pkgname.conf.d"
}
-sha512sums="5e6f57840a215b407055b1c1cdb550e151079a692746436bd67d6a8ef1e830b6fa1c002656b8b56081c4a61a5b6b6b064bbff254640f560836253aa2ab4ab1e9 telegraf-1.12.2.tar.gz
+sha512sums="8b8e479b2ce78fcea5a25919ac84d7dbf321c9aae00b9f960d99e59c038b535d6347dafdfe6948499ef262ed492d5881b9003ea51fda76e7bd107dbbfb342dc4 telegraf-1.12.3.tar.gz
abe483deb8e12fe140de2c36d17bbfbc97ed7a5de8c3d76162357f7ba6575b8236b7197b92a26ed6d54f95c1ccbfc12ca62d6cc0371bf49d10a1ea5622a51ed1 telegraf.initd
90188e1ba88d3a0714e1590f78a2abf3719cbe2f3d734f9c72ded13cf9c8495c1bf6696f2780289775bf53da347eee72aea8fe5555a4754360d1fbaa9d3c362b telegraf.confd"
--
GitLab