Skip to content

Commit c1581c5

Browse files
committed
integration: fix compat check for CNI DNS test
Signed-off-by: Tonis Tiigi <[email protected]>
1 parent 2e14cdd commit c1581c5

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ func testBridgeNetworking(t *testing.T, sb integration.Sandbox) {
312312
}
313313

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

util/testutil/integration/dockerd.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ func InitDockerdWorker() {
3434
FeatureProvenance,
3535
FeatureSBOM,
3636
FeatureSecurityMode,
37+
FeatureCNINetwork,
3738
},
3839
})
3940
Register(&moby{
4041
name: "dockerd-containerd",
4142
rootless: false,
4243
unsupported: []string{
4344
FeatureSecurityMode,
45+
FeatureCNINetwork,
4446
},
4547
})
4648
}

util/testutil/integration/sandbox.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ const (
285285
FeatureSBOM = "sbom"
286286
FeatureSecurityMode = "security mode"
287287
FeatureSourceDateEpoch = "source date epoch"
288+
FeatureCNINetwork = "cni network"
288289
)
289290

290291
var features = map[string]struct{}{
@@ -303,6 +304,7 @@ var features = map[string]struct{}{
303304
FeatureSBOM: {},
304305
FeatureSecurityMode: {},
305306
FeatureSourceDateEpoch: {},
307+
FeatureCNINetwork: {},
306308
}
307309

308310
func CheckFeatureCompat(t *testing.T, sb Sandbox, reason ...string) {

0 commit comments

Comments
 (0)