Merge pull request moby#3567 from tonistiigi/cni-test-fix

integration: fix compat check for CNI DNS test

Author: tonistiigi

client/build_test.go

@@ -1991,7 +1991,6 @@ func testClientGatewayContainerSignal(t *testing.T, sb integration.Sandbox) {
 }
 
 func testClientGatewayNilResult(t *testing.T, sb integration.Sandbox) {
-	integration.CheckFeatureCompat(t, sb, "hangs: https://github.com/moby/buildkit/pull/3176#issuecomment-1323954327")
 	requiresLinux(t)
 	c, err := New(sb.Context(), sb.Address())
 	require.NoError(t, err)

client/client_test.go

@@ -312,7 +312,7 @@ func testBridgeNetworking(t *testing.T, sb integration.Sandbox) {
 }
 
 func testBridgeNetworkingDNSNoRootless(t *testing.T, sb integration.Sandbox) {
-	integration.CheckFeatureCompat(t, sb, "hangs: https://github.com/moby/buildkit/issues/3171")
+	integration.CheckFeatureCompat(t, sb, integration.FeatureCNINetwork)
 	if os.Getenv("BUILDKIT_RUN_NETWORK_INTEGRATION_TESTS") == "" {
 		t.SkipNow()
 	}

util/testutil/integration/dockerd.go

@@ -34,13 +34,15 @@ func InitDockerdWorker() {
 			FeatureProvenance,
 			FeatureSBOM,
 			FeatureSecurityMode,
+			FeatureCNINetwork,
 		},
 	})
 	Register(&moby{
 		name:     "dockerd-containerd",
 		rootless: false,
 		unsupported: []string{
 			FeatureSecurityMode,
+			FeatureCNINetwork,
 		},
 	})
 }

util/testutil/integration/sandbox.go

@@ -285,6 +285,7 @@ const (
 	FeatureSBOM             = "sbom"
 	FeatureSecurityMode     = "security mode"
 	FeatureSourceDateEpoch  = "source date epoch"
+	FeatureCNINetwork       = "cni network"
 )
 
 var features = map[string]struct{}{
@@ -303,6 +304,7 @@ var features = map[string]struct{}{
 	FeatureSBOM:             {},
 	FeatureSecurityMode:     {},
 	FeatureSourceDateEpoch:  {},
+	FeatureCNINetwork:       {},
 }
 
 func CheckFeatureCompat(t *testing.T, sb Sandbox, reason ...string) {