From 62479fb16a6638d80c2deb4b2d8d1208a5661ade Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 22 Jan 2021 15:03:18 -0800 Subject: [PATCH 1/3] only run TestFunctional/DockerEnv with docker container runtime --- test/integration/functional_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index 09e99f7fb4..b80dbb08c6 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -160,6 +160,9 @@ func validateNodeLabels(ctx context.Context, t *testing.T, profile string) { // check functionality of minikube after evaling docker-env 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() From cc4d2d450e053bea39cc30dbfb1dbfb38b580fd5 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 22 Jan 2021 15:05:06 -0800 Subject: [PATCH 2/3] Also skip skaffold test because it also requires docker-env --- test/integration/skaffold_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/skaffold_test.go b/test/integration/skaffold_test.go index d1d1a4a93b..7695f9dc77 100644 --- 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)) From 9bd1528dbe3a849cecfa0e9363254b74dbc2a547 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 22 Jan 2021 15:56:21 -0800 Subject: [PATCH 3/3] Add TODO --- test/integration/functional_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index b80dbb08c6..425de6f2a2 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -159,6 +159,7 @@ 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)