grafana-agent: 0.21.2 -> 0.24.1 (#169558)

We can skip our little patch. The file was removed in
https://github.com/grafana/agent/pull/1362, which includes
https://github.com/grafana/agent/pull/1268.

The condition to exempt network tests was inverted as part of these PRs,
so we now need to set GOFLAGS explicitly to exclude tests that can't run
inside the Nix sandbox.
This commit is contained in:
Florian Klink
2022-04-21 11:41:18 +02:00
committed by GitHub
parent b06d35b406
commit 1635fb33ae
2 changed files with 6 additions and 21 deletions

View File

@@ -2,20 +2,20 @@
buildGoModule rec {
pname = "grafana-agent";
version = "0.21.2";
version = "0.24.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "agent";
sha256 = "sha256-s++21feD3L2HuVYFjWhNIOGTjjX+lXwURc4PqbwFnhI=";
sha256 = "sha256-WxULVtqKxYXMWNY4l0wvTkqcDkPrlHcS70NgQhe8nzU=";
};
vendorSha256 = "sha256-kxLtbElzfimC/ZefUyTlfQiUZo4y0f1riajRm5shVdU=";
vendorSha256 = "sha256-hdo8uiVJAMMPo1N8kLDFPSbyTr5WxNKtq8E7pj6Plak=";
patches = [
# https://github.com/grafana/agent/issues/731
./skip_test_requiring_network.patch
tags = [
"nonetwork"
"nodocker"
];
# uses go-systemd, which uses libsystemd headers

View File

@@ -1,15 +0,0 @@
diff --git a/pkg/operator/selector_eventhandler_test.go b/pkg/operator/selector_eventhandler_test.go
index 7b6ec602..e79bae0e 100644
--- a/pkg/operator/selector_eventhandler_test.go
+++ b/pkg/operator/selector_eventhandler_test.go
@@ -39,6 +39,10 @@ var (
// TestEnqueueRequestForSelector creates an example Kubenretes cluster and runs
// EnqueueRequestForSelector to validate it works.
func TestEnqueueRequestForSelector(t *testing.T) {
+ // Requires network access, which is not available during
+ // the nixpkgs sandboxed build
+ t.Skip()
+
l := log.NewNopLogger()
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)