Merge pull request #10261 from priyawadhwa/cni-on-containerd

Run CNI tests on containerd

test/integration/net_test.go

@@ -34,7 +34,9 @@ import (
 
 func TestNetworkPlugins(t *testing.T) {
 	MaybeParallel(t)
-	validations(t)
+	if NoneDriver() {
+		t.Skip("skipping since test for none driver")
+	}
 
 	t.Run("group", func(t *testing.T) {
 		tests := []struct {
@@ -204,12 +206,3 @@ func TestNetworkPlugins(t *testing.T) {
 		}
 	})
 }
-
-func validations(t *testing.T) {
-	if NoneDriver() {
-		t.Skip("skipping since test for none driver")
-	}
-	if ContainerdContainerRuntime() {
-		t.Skip("skipping as this test currently times out on containerd")
-	}
-}