From e2359569e422d80c365155802f314b45b80d30df Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Wed, 20 Jan 2021 16:50:03 -0800 Subject: [PATCH 1/7] Only run TestOffline for specified container runtime --- test/integration/aab_offline_test.go | 4 +++- test/integration/main_test.go | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/test/integration/aab_offline_test.go b/test/integration/aab_offline_test.go index ced6b5da2d..d41e682f23 100644 --- a/test/integration/aab_offline_test.go +++ b/test/integration/aab_offline_test.go @@ -33,7 +33,9 @@ func TestOffline(t *testing.T) { rt := rt t.Run(rt, func(t *testing.T) { MaybeParallel(t) - + if requestedRuntime := ContainerRuntime(); requestedRuntime != "" && requestedRuntime != rt { + t.Skipf("skipping test for container runtime %s, only testing runtime %s", rt, requestedRuntime) + } if rt != "docker" && arm64Platform() { t.Skipf("skipping %s - only docker runtime supported on arm64. See https://github.com/kubernetes/minikube/issues/10144", t.Name()) } diff --git a/test/integration/main_test.go b/test/integration/main_test.go index 65ee8f5707..12083bf8c3 100644 --- a/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -124,6 +124,20 @@ func PodmanDriver() bool { return strings.Contains(*startArgs, "--vm-driver=podman") || strings.Contains(*startArgs, "driver=podman") } +// ContainerRuntime returns the name of a specific container runtime if it was specified +func ContainerRuntime() string { + flag := "--container-runtime=" + if !strings.Contains(*startArgs, flag) { + return "" + } + for _, s := range StartArgs() { + if strings.HasPrefix(s, flag) { + return strings.TrimPrefix(s, flag) + } + } + return "" +} + // KicDriver returns whether or not this test is using the docker or podman driver func KicDriver() bool { return DockerDriver() || PodmanDriver() From 8214b3849fc9e252b906bb9b9f0cda6bac336d30 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Wed, 20 Jan 2021 16:55:23 -0800 Subject: [PATCH 2/7] Include TestDownloadOnly --- test/integration/aaa_download_only_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go index b39d98bae1..9105c0d63c 100644 --- a/test/integration/aaa_download_only_test.go +++ b/test/integration/aaa_download_only_test.go @@ -42,6 +42,9 @@ import ( func TestDownloadOnly(t *testing.T) { for _, r := range []string{"crio", "docker", "containerd"} { t.Run(r, func(t *testing.T) { + if requestedRuntime := ContainerRuntime(); requestedRuntime != "" && requestedRuntime != rt { + t.Skipf("skipping test for container runtime %s, only testing runtime %s", rt, requestedRuntime) + } // Stores the startup run result for later error messages var rrr *RunResult From dd6d845dcca654fa985e46d84a58d43358bcd849 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Thu, 21 Jan 2021 10:56:28 -0800 Subject: [PATCH 3/7] Fix var --- test/integration/aaa_download_only_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go index 9105c0d63c..444e44bbdd 100644 --- a/test/integration/aaa_download_only_test.go +++ b/test/integration/aaa_download_only_test.go @@ -42,8 +42,8 @@ import ( func TestDownloadOnly(t *testing.T) { for _, r := range []string{"crio", "docker", "containerd"} { t.Run(r, func(t *testing.T) { - if requestedRuntime := ContainerRuntime(); requestedRuntime != "" && requestedRuntime != rt { - t.Skipf("skipping test for container runtime %s, only testing runtime %s", rt, requestedRuntime) + if requestedRuntime := ContainerRuntime(); requestedRuntime != "" && requestedRuntime != r { + t.Skipf("skipping test for container runtime %s, only testing runtime %s", r, requestedRuntime) } // Stores the startup run result for later error messages var rrr *RunResult From 0591fbd5575508f35b3a0322c8a2580a07065ce2 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Thu, 21 Jan 2021 12:12:33 -0800 Subject: [PATCH 4/7] Remove container runtime info from tests --- hack/jenkins/common.sh | 4 +- test/integration/aaa_download_only_test.go | 223 ++++++++++----------- test/integration/aab_offline_test.go | 59 +++--- 3 files changed, 137 insertions(+), 149 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 0182427673..a2a3b09944 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -301,8 +301,10 @@ if test -f "${TEST_OUT}"; then fi touch "${TEST_OUT}" -if [ ! -z "${CONTAINER_RUNTIME}" ] +if [ -z "${CONTAINER_RUNTIME}" ] then + EXTRA_START_ARGS="${EXTRA_START_ARGS} --container-runtime=docker" +else EXTRA_START_ARGS="${EXTRA_START_ARGS} --container-runtime=${CONTAINER_RUNTIME}" fi diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go index 444e44bbdd..da79eecfd2 100644 --- a/test/integration/aaa_download_only_test.go +++ b/test/integration/aaa_download_only_test.go @@ -40,134 +40,129 @@ import ( ) func TestDownloadOnly(t *testing.T) { - for _, r := range []string{"crio", "docker", "containerd"} { - t.Run(r, func(t *testing.T) { - if requestedRuntime := ContainerRuntime(); requestedRuntime != "" && requestedRuntime != r { - t.Skipf("skipping test for container runtime %s, only testing runtime %s", r, requestedRuntime) + // Stores the startup run result for later error messages + var rrr *RunResult + + profile := UniqueProfileName("download-only") + ctx, cancel := context.WithTimeout(context.Background(), Minutes(30)) + defer Cleanup(t, profile, cancel) + containerRuntime := ContainerRuntime() + + versions := []string{ + constants.OldestKubernetesVersion, + constants.DefaultKubernetesVersion, + constants.NewestKubernetesVersion, + } + + for _, v := range versions { + t.Run(v, func(t *testing.T) { + defer PostMortemLogs(t, profile) + + // --force to avoid uid check + args := append([]string{"start", "-o=json", "--download-only", "-p", profile, "--force", "--alsologtostderr", fmt.Sprintf("--kubernetes-version=%s", v)}, StartArgs()...) + + rt, err := Run(t, exec.CommandContext(ctx, Target(), args...)) + if rrr == nil { + // Preserve the initial run-result for debugging + rrr = rt } - // Stores the startup run result for later error messages - var rrr *RunResult - - profile := UniqueProfileName(r) - ctx, cancel := context.WithTimeout(context.Background(), Minutes(30)) - defer Cleanup(t, profile, cancel) - - versions := []string{ - constants.OldestKubernetesVersion, - constants.DefaultKubernetesVersion, - constants.NewestKubernetesVersion, + if err != nil { + t.Errorf("failed to download only. args: %q %v", args, err) } - - for _, v := range versions { - t.Run(v, func(t *testing.T) { - defer PostMortemLogs(t, profile) - - // --force to avoid uid check - args := append([]string{"start", "-o=json", "--download-only", "-p", profile, "--force", "--alsologtostderr", fmt.Sprintf("--kubernetes-version=%s", v), fmt.Sprintf("--container-runtime=%s", r)}, StartArgs()...) - - rt, err := Run(t, exec.CommandContext(ctx, Target(), args...)) - if rrr == nil { - // Preserve the initial run-result for debugging - rrr = rt - } + t.Run("check json events", func(t *testing.T) { + s := bufio.NewScanner(bytes.NewReader(rt.Stdout.Bytes())) + for s.Scan() { + var rtObj map[string]interface{} + err = json.Unmarshal(s.Bytes(), &rtObj) if err != nil { - t.Errorf("failed to download only. args: %q %v", args, err) - } - t.Run("check json events", func(t *testing.T) { - s := bufio.NewScanner(bytes.NewReader(rt.Stdout.Bytes())) - for s.Scan() { - var rtObj map[string]interface{} - err = json.Unmarshal(s.Bytes(), &rtObj) - if err != nil { - t.Errorf("failed to parse output: %v", err) - } else if step, ok := rtObj["data"]; ok { - if stepMap, ok := step.(map[string]interface{}); ok { - if stepMap["currentstep"] == "" { - t.Errorf("Empty step number for %v", stepMap["name"]) - } - } - } - } - }) - - // skip for none, as none driver does not have preload feature. - if !NoneDriver() { - if download.PreloadExists(v, r, true) { - // Just make sure the tarball path exists - if _, err := os.Stat(download.TarballPath(v, r)); err != nil { - t.Errorf("failed to verify preloaded tarball file exists: %v", err) - } - return - } - } - imgs, err := images.Kubeadm("", v) - if err != nil { - t.Errorf("failed to get kubeadm images for %v: %+v", v, err) - } - - // skip verify for cache images if --driver=none - if !NoneDriver() { - for _, img := range imgs { - img = strings.Replace(img, ":", "_", 1) // for example kube-scheduler:v1.15.2 --> kube-scheduler_v1.15.2 - fp := filepath.Join(localpath.MiniPath(), "cache", "images", img) - _, err := os.Stat(fp) - if err != nil { - t.Errorf("expected image file exist at %q but got error: %v", fp, err) + t.Errorf("failed to parse output: %v", err) + } else if step, ok := rtObj["data"]; ok { + if stepMap, ok := step.(map[string]interface{}); ok { + if stepMap["currentstep"] == "" { + t.Errorf("Empty step number for %v", stepMap["name"]) } } } - - // checking binaries downloaded (kubelet,kubeadm) - for _, bin := range constants.KubernetesReleaseBinaries { - fp := filepath.Join(localpath.MiniPath(), "cache", "linux", v, bin) - _, err := os.Stat(fp) - if err != nil { - t.Errorf("expected the file for binary exist at %q but got error %v", fp, err) - } - } - - // If we are on darwin/windows, check to make sure OS specific kubectl has been downloaded - // as well for the `minikube kubectl` command - if runtime.GOOS == "linux" { - return - } - binary := "kubectl" - if runtime.GOOS == "windows" { - binary = "kubectl.exe" - } - fp := filepath.Join(localpath.MiniPath(), "cache", runtime.GOOS, v, binary) - if _, err := os.Stat(fp); err != nil { - t.Errorf("expected the file for binary exist at %q but got error %v", fp, err) - } - }) - } - - // This is a weird place to test profile deletion, but this test is serial, and we have a profile to delete! - t.Run("DeleteAll", func(t *testing.T) { - defer PostMortemLogs(t, profile) - - if !CanCleanup() { - t.Skip("skipping, as cleanup is disabled") - } - rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all")) - if err != nil { - t.Errorf("failed to delete all. args: %q : %v", rr.Command(), err) } }) - // Delete should always succeed, even if previously partially or fully deleted. - t.Run("DeleteAlwaysSucceeds", func(t *testing.T) { - defer PostMortemLogs(t, profile) - if !CanCleanup() { - t.Skip("skipping, as cleanup is disabled") + // skip for none, as none driver does not have preload feature. + if !NoneDriver() { + if download.PreloadExists(v, containerRuntime, true) { + // Just make sure the tarball path exists + if _, err := os.Stat(download.TarballPath(v, containerRuntime)); err != nil { + t.Errorf("failed to verify preloaded tarball file exists: %v", err) + } + return } - rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile)) + } + imgs, err := images.Kubeadm("", v) + if err != nil { + t.Errorf("failed to get kubeadm images for %v: %+v", v, err) + } + + // skip verify for cache images if --driver=none + if !NoneDriver() { + for _, img := range imgs { + img = strings.Replace(img, ":", "_", 1) // for example kube-scheduler:v1.15.2 --> kube-scheduler_v1.15.2 + fp := filepath.Join(localpath.MiniPath(), "cache", "images", img) + _, err := os.Stat(fp) + if err != nil { + t.Errorf("expected image file exist at %q but got error: %v", fp, err) + } + } + } + + // checking binaries downloaded (kubelet,kubeadm) + for _, bin := range constants.KubernetesReleaseBinaries { + fp := filepath.Join(localpath.MiniPath(), "cache", "linux", v, bin) + _, err := os.Stat(fp) if err != nil { - t.Errorf("failed to delete. args: %q: %v", rr.Command(), err) + t.Errorf("expected the file for binary exist at %q but got error %v", fp, err) } - }) + } + + // If we are on darwin/windows, check to make sure OS specific kubectl has been downloaded + // as well for the `minikube kubectl` command + if runtime.GOOS == "linux" { + return + } + binary := "kubectl" + if runtime.GOOS == "windows" { + binary = "kubectl.exe" + } + fp := filepath.Join(localpath.MiniPath(), "cache", runtime.GOOS, v, binary) + if _, err := os.Stat(fp); err != nil { + t.Errorf("expected the file for binary exist at %q but got error %v", fp, err) + } }) } + + // This is a weird place to test profile deletion, but this test is serial, and we have a profile to delete! + t.Run("DeleteAll", func(t *testing.T) { + defer PostMortemLogs(t, profile) + + if !CanCleanup() { + t.Skip("skipping, as cleanup is disabled") + } + rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all")) + if err != nil { + t.Errorf("failed to delete all. args: %q : %v", rr.Command(), err) + } + }) + // Delete should always succeed, even if previously partially or fully deleted. + t.Run("DeleteAlwaysSucceeds", func(t *testing.T) { + defer PostMortemLogs(t, profile) + + if !CanCleanup() { + t.Skip("skipping, as cleanup is disabled") + } + rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile)) + if err != nil { + t.Errorf("failed to delete. args: %q: %v", rr.Command(), err) + } + }) + } func TestDownloadOnlyKic(t *testing.T) { diff --git a/test/integration/aab_offline_test.go b/test/integration/aab_offline_test.go index d41e682f23..8943d1b634 100644 --- a/test/integration/aab_offline_test.go +++ b/test/integration/aab_offline_test.go @@ -26,43 +26,34 @@ import ( "testing" ) -// TestOffline makes sure minikube works without internet, once it the user has already cached the images, This test has to run after TestDownloadOnly! +// TestOffline makes sure minikube works without internet, once it the user has already cached the images, This test has to run after TestDownloadOnly func TestOffline(t *testing.T) { - t.Run("group", func(t *testing.T) { - for _, rt := range []string{"docker", "crio", "containerd"} { - rt := rt - t.Run(rt, func(t *testing.T) { - MaybeParallel(t) - if requestedRuntime := ContainerRuntime(); requestedRuntime != "" && requestedRuntime != rt { - t.Skipf("skipping test for container runtime %s, only testing runtime %s", rt, requestedRuntime) - } - if rt != "docker" && arm64Platform() { - t.Skipf("skipping %s - only docker runtime supported on arm64. See https://github.com/kubernetes/minikube/issues/10144", t.Name()) - } + MaybeParallel(t) + rt := ContainerRuntime() + if rt != "docker" && arm64Platform() { + t.Skipf("skipping %s - only docker runtime supported on arm64. See https://github.com/kubernetes/minikube/issues/10144", t.Name()) + } - if rt != "docker" && NoneDriver() { - t.Skipf("skipping %s - incompatible with none driver", t.Name()) - } + if rt != "docker" && NoneDriver() { + t.Skipf("skipping %s - incompatible with none driver", t.Name()) + } - profile := UniqueProfileName(fmt.Sprintf("offline-%s", rt)) - ctx, cancel := context.WithTimeout(context.Background(), Minutes(15)) - defer CleanupWithLogs(t, profile, cancel) + profile := UniqueProfileName(fmt.Sprintf("offline-%s", rt)) + ctx, cancel := context.WithTimeout(context.Background(), Minutes(15)) + defer CleanupWithLogs(t, profile, cancel) - startArgs := []string{"start", "-p", profile, "--alsologtostderr", "-v=1", "--memory=2000", "--wait=true", "--container-runtime", rt} - startArgs = append(startArgs, StartArgs()...) - c := exec.CommandContext(ctx, Target(), startArgs...) - env := os.Environ() - // RFC1918 address that unlikely to host working a proxy server - env = append(env, "HTTP_PROXY=172.16.1.1:1") - env = append(env, "HTTP_PROXYS=172.16.1.1:1") + startArgs := []string{"start", "-p", profile, "--alsologtostderr", "-v=1", "--memory=2000", "--wait=true"} + startArgs = append(startArgs, StartArgs()...) + c := exec.CommandContext(ctx, Target(), startArgs...) + env := os.Environ() + // RFC1918 address that unlikely to host working a proxy server + env = append(env, "HTTP_PROXY=172.16.1.1:1") + env = append(env, "HTTP_PROXYS=172.16.1.1:1") - c.Env = env - rr, err := Run(t, c) - if err != nil { - // Fatal so that we may collect logs before stop/delete steps - t.Fatalf("%s failed: %v", rr.Command(), err) - } - }) - } - }) + c.Env = env + rr, err := Run(t, c) + if err != nil { + // Fatal so that we may collect logs before stop/delete steps + t.Fatalf("%s failed: %v", rr.Command(), err) + } } From ebf76d5839598cd5b53cb5d971f0d0d05ccb4255 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 22 Jan 2021 14:26:12 -0800 Subject: [PATCH 5/7] Revert --- hack/jenkins/common.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index a2a3b09944..0182427673 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -301,10 +301,8 @@ if test -f "${TEST_OUT}"; then fi touch "${TEST_OUT}" -if [ -z "${CONTAINER_RUNTIME}" ] +if [ ! -z "${CONTAINER_RUNTIME}" ] then - EXTRA_START_ARGS="${EXTRA_START_ARGS} --container-runtime=docker" -else EXTRA_START_ARGS="${EXTRA_START_ARGS} --container-runtime=${CONTAINER_RUNTIME}" fi From df93c7ca2b74c25848ef78cc1d05f3b1e1225f23 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 22 Jan 2021 14:29:41 -0800 Subject: [PATCH 6/7] fix function --- test/integration/main_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/integration/main_test.go b/test/integration/main_test.go index cb1b7bb420..e15943c2c6 100644 --- a/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -127,15 +127,12 @@ func PodmanDriver() bool { // ContainerRuntime returns the name of a specific container runtime if it was specified func ContainerRuntime() string { flag := "--container-runtime=" - if !strings.Contains(*startArgs, flag) { - return "" - } for _, s := range StartArgs() { if strings.HasPrefix(s, flag) { return strings.TrimPrefix(s, flag) } } - return "" + return "docker" } // KicDriver returns whether or not this test is using the docker or podman driver From edee1223e27491fc4e5fdd6f0df0c8fe7cf5ebdc Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 22 Jan 2021 14:55:00 -0800 Subject: [PATCH 7/7] fix merge conflict --- test/integration/main_test.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test/integration/main_test.go b/test/integration/main_test.go index 42c3097556..d1a129790d 100644 --- a/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -125,17 +125,6 @@ func PodmanDriver() bool { return strings.Contains(*startArgs, "--vm-driver=podman") || strings.Contains(*startArgs, "driver=podman") } -// ContainerRuntime returns the name of a specific container runtime if it was specified -func ContainerRuntime() string { - flag := "--container-runtime=" - for _, s := range StartArgs() { - if strings.HasPrefix(s, flag) { - return strings.TrimPrefix(s, flag) - } - } - return "docker" -} - // KicDriver returns whether or not this test is using the docker or podman driver func KicDriver() bool { return DockerDriver() || PodmanDriver()