diff --git a/test/integration/main_test.go b/test/integration/main_test.go index d1a129790d..58a041eb0b 100644 --- a/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -115,6 +115,11 @@ func HyperVDriver() bool { return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv") } +// VirtualboxDriver returns whether or not this test is using the VirtualBox driver +func VirtualboxDriver() bool { + return strings.Contains(*startArgs, "--driver=virtualbox") || strings.Contains(*startArgs, "--vm-driver=virtualbox") +} + // DockerDriver returns whether or not this test is using the docker or podman driver func DockerDriver() bool { return strings.Contains(*startArgs, "--driver=docker") || strings.Contains(*startArgs, "--vm-driver=docker") diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 84d1b2afa8..afd924ff25 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -51,7 +51,6 @@ func TestStartStop(t *testing.T) { "--kvm-qemu-uri=qemu:///system", "--disable-driver-mounts", "--keep-context=false", - "--container-runtime=docker", }}, {"newest-cni", constants.NewestKubernetesVersion, []string{ "--feature-gates", @@ -60,14 +59,13 @@ func TestStartStop(t *testing.T) { "--extra-config=kubelet.network-plugin=cni", "--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16", }}, - {"containerd", constants.DefaultKubernetesVersion, []string{ - "--container-runtime=containerd", - "--docker-opt", - "containerd=/var/run/containerd/containerd.sock", + {"default-k8s-different-port", constants.DefaultKubernetesVersion, []string{ "--apiserver-port=8444", }}, - {"crio", "v1.15.7", []string{ - "--container-runtime=crio", + {"no-preload", constants.NewestKubernetesVersion, []string{ + "--preload=false", + }}, + {"disable-driver-mounts", constants.DefaultKubernetesVersion, []string{ "--disable-driver-mounts", "--extra-config=kubeadm.ignore-preflight-errors=SystemVerification", }}, @@ -87,6 +85,9 @@ func TestStartStop(t *testing.T) { if !strings.Contains(tc.name, "docker") && NoneDriver() { t.Skipf("skipping %s - incompatible with none driver", t.Name()) } + if strings.Contains(tc.name, "disable_driver_mounts") && !VirtualboxDriver() { + t.Skipf("skipping %s - only runs on virtualbox", t.Name()) + } waitFlag := "--wait=true" if strings.Contains(tc.name, "cni") { // wait=app_running is broken for CNI https://github.com/kubernetes/minikube/issues/7354