Merge pull request #10227 from priyawadhwa/functional-docker-env

Only run integration tests that depend on docker-env with docker container runtime
kubernetes · Jan 23, 2021 · b1ccf54 · b1ccf54
2 parents d4f8664 + 9bd1528
commit b1ccf54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
@@ -159,7 +159,11 @@ func validateNodeLabels(ctx context.Context, t *testing.T, profile string) {
 }
 
 // check functionality of minikube after evaling docker-env
+// TODO: Add validatePodmanEnv for crio runtime: #10231
 func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
+	if cr := ContainerRuntime(); cr != "docker" {
+		t.Skipf("only validate docker env with docker container runtime, currently testing %s", cr)
+	}
 	defer PostMortemLogs(t, profile)
 	mctx, cancel := context.WithTimeout(ctx, Seconds(120))
 	defer cancel()

diff --git a/test/integration/skaffold_test.go b/test/integration/skaffold_test.go
@@ -38,6 +38,9 @@ func TestSkaffold(t *testing.T) {
 	if NoneDriver() {
 		t.Skip("none driver doesn't support `minikube docker-env`; skaffold depends on this command")
 	}
+	if cr := ContainerRuntime(); cr != "docker" {
+		t.Skipf("skaffold requires docker-env, currently testing %s container runtime", cr)
+	}
 
 	profile := UniqueProfileName("skaffold")
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(5))