Merge pull request moby#5727 from crazy-max/test-skip-cdi-moby

test: skip cdi feature tests on moby

Author: tonistiigi

client/client_test.go

@@ -10960,6 +10960,7 @@ func testCDI(t *testing.T, sb integration.Sandbox) {
 	}
 
 	integration.SkipOnPlatform(t, "windows")
+	workers.CheckFeatureCompat(t, sb, workers.FeatureCDI)
 	c, err := New(sb.Context(), sb.Address())
 	require.NoError(t, err)
 	defer c.Close()
@@ -11024,6 +11025,7 @@ func testCDIFirst(t *testing.T, sb integration.Sandbox) {
 	}
 
 	integration.SkipOnPlatform(t, "windows")
+	workers.CheckFeatureCompat(t, sb, workers.FeatureCDI)
 	c, err := New(sb.Context(), sb.Address())
 	require.NoError(t, err)
 	defer c.Close()
@@ -11088,6 +11090,7 @@ func testCDIWildcard(t *testing.T, sb integration.Sandbox) {
 	}
 
 	integration.SkipOnPlatform(t, "windows")
+	workers.CheckFeatureCompat(t, sb, workers.FeatureCDI)
 	c, err := New(sb.Context(), sb.Address())
 	require.NoError(t, err)
 	defer c.Close()
@@ -11142,6 +11145,7 @@ func testCDIClass(t *testing.T, sb integration.Sandbox) {
 	}
 
 	integration.SkipOnPlatform(t, "windows")
+	workers.CheckFeatureCompat(t, sb, workers.FeatureCDI)
 	c, err := New(sb.Context(), sb.Address())
 	require.NoError(t, err)
 	defer c.Close()

util/testutil/workers/dockerd.go

@@ -41,6 +41,7 @@ func InitDockerdWorker() {
 			FeatureSBOM,
 			FeatureSecurityMode,
 			FeatureCNINetwork,
+			FeatureCDI,
 		},
 	})
 	integration.Register(&Moby{
@@ -51,6 +52,7 @@ func InitDockerdWorker() {
 			FeatureSecurityMode,
 			FeatureCNINetwork,
 			FeatureContentCheck,
+			FeatureCDI,
 		},
 	})
 }

util/testutil/workers/features.go

@@ -31,6 +31,7 @@ const (
 	FeatureSourceDateEpoch      = "source_date_epoch"
 	FeatureCNINetwork           = "cni_network"
 	FeatureContentCheck         = "content_check"
+	FeatureCDI                  = "cdi"
 )
 
 var features = map[string]struct{}{
@@ -58,6 +59,7 @@ var features = map[string]struct{}{
 	FeatureSourceDateEpoch:      {},
 	FeatureCNINetwork:           {},
 	FeatureContentCheck:         {},
+	FeatureCDI:                  {},
 }
 
 func CheckFeatureCompat(t *testing.T, sb integration.Sandbox, reason ...string) {