From be36ac13e581cd594cc424fcd3516aef34bd252e Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 25 Oct 2024 12:11:04 -0700 Subject: [PATCH 1/2] .golanci.yml: rm runc exception This is not needed since commit a6d5b48e67 ("vendor: github.com/opencontainers/runc v1.2.0"). Signed-off-by: Kir Kolyshkin --- .golangci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 65bb535ba4290..c76dcad2d40b9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -47,8 +47,6 @@ linters-settings: desc: The logs package has moved to a separate module, https://github.com/containerd/log - pkg: "github.com/containerd/containerd/pkg/userns" desc: Use github.com/moby/sys/userns instead. - - pkg: "github.com/opencontainers/runc/libcontainer/userns" - desc: Use github.com/moby/sys/userns instead. - pkg: "github.com/tonistiigi/fsutil" desc: The fsutil module does not have a stable API, so we should not have a direct dependency unless necessary. From f96994ec17b1c4dc1d3cbc18cfa1998cf94d2e29 Mon Sep 17 00:00:00 2001 From: Rodrigo Campos Date: Fri, 30 Aug 2024 11:44:51 +0200 Subject: [PATCH 2/2] Skip tests that are flaky for 4 already Some other tests on this file where skipped with this same line. Let's skip this one, that seems to be flaky too. Signed-off-by: Rodrigo Campos --- integration/container/nat_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go index 9506430dd3719..0f3fe80b7da43 100644 --- a/integration/container/nat_test.go +++ b/integration/container/nat_test.go @@ -40,6 +40,7 @@ func TestNetworkNat(t *testing.T) { func TestNetworkLocalhostTCPNat(t *testing.T) { skip.If(t, testEnv.IsRemoteDaemon) + skip.If(t, testEnv.GitHubActions, "FIXME: https://github.com/moby/moby/issues/41561") ctx := setupTest(t)