diff --git a/test/integration/fn_tunnel_cmd.go b/test/integration/fn_tunnel_cmd.go index b9e43c8cc2..a080bc1b78 100644 --- a/test/integration/fn_tunnel_cmd.go +++ b/test/integration/fn_tunnel_cmd.go @@ -71,7 +71,7 @@ func validateTunnelCmd(ctx context.Context, t *testing.T, profile string) { if err != nil { t.Fatalf("%s failed: %v", rr.Args, err) } - if _, err := PodWait(ctx, t, profile, "default", "run=nginx-svc", 2*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "run=nginx-svc", 4*time.Minute); err != nil { t.Fatalf("wait: %v", err) } diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index cdda2dd55d..ea10c06c28 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -171,7 +171,7 @@ func validateKubectlGetPods(ctx context.Context, t *testing.T, profile string) { // validateAddonManager asserts that the kube-addon-manager pod is deployed properly func validateAddonManager(ctx context.Context, t *testing.T, profile string) { // If --wait=false, this may take a couple of minutes - if _, err := PodWait(ctx, t, profile, "kube-system", "component=kube-addon-manager", 5*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "kube-system", "component=kube-addon-manager", 10*time.Minute); err != nil { t.Fatalf("wait: %v", err) } } @@ -456,7 +456,7 @@ func validateServiceCmd(ctx context.Context, t *testing.T, profile string) { t.Logf("%s failed: %v (may not be an error)", rr.Args, err) } - if _, err := PodWait(ctx, t, profile, "default", "app=hello-node", 5*time.Minute); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "app=hello-node", 10*time.Minute); err != nil { t.Fatalf("wait: %v", err) } @@ -599,7 +599,7 @@ func validateMySQL(ctx context.Context, t *testing.T, profile string) { t.Fatalf("%s failed: %v", rr.Args, err) } - names, err := PodWait(ctx, t, profile, "default", "app=mysql", 5*time.Minute) + names, err := PodWait(ctx, t, profile, "default", "app=mysql", 10*time.Minute) if err != nil { t.Fatalf("podwait: %v", err) } diff --git a/test/integration/main.go b/test/integration/main.go index 35ba63dfc0..7b2b66ea3c 100644 --- a/test/integration/main.go +++ b/test/integration/main.go @@ -35,7 +35,7 @@ var cleanup = flag.Bool("cleanup", true, "cleanup failed test run") var enableGvisor = flag.Bool("gvisor", false, "run gvisor integration test (slow)") // Ensure that multiple calls to startMachine do not collide with one another -var startOffset = flag.Duration("start-offset", 45*time.Second, "how much time to offset between cluster starts") +var startOffset = flag.Duration("start-offset", 50*time.Second, "how much time to offset between cluster starts") var postMortemLogs = flag.Bool("postmortem-logs", true, "show logs after a failed test run") // Paths to files - normally set for CI diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 199d06a820..a8cbfaf8f7 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -164,10 +164,15 @@ func TestStartStop(t *testing.T) { gotImages := []string{} for _, img := range jv["images"] { for _, i := range img.Tags { - // Ignore non-Kubernetes images - if !strings.Contains(i, "ingress") && !strings.Contains(i, "busybox") { - // Remove docker.io for naming consistency between container runtimes - gotImages = append(gotImages, strings.TrimPrefix(i, "docker.io/")) + // Ignore images deployed by addons + if strings.Contains(i, "k8s.gcr.io") || strings.Contains(i, "kubernetesui") || strings.Contains(i, "k8s-minikube") { + // May be pulled in by an unrelated addon + if !strings.Contains(i, "pause:latest") { + // Remove docker.io for naming consistency between container runtimes + gotImages = append(gotImages, strings.TrimPrefix(i, "docker.io/")) + } + } else { + t.Logf("Found unexpected foreign image (not fatal): %s", i) } } } @@ -184,7 +189,7 @@ func TestStartStop(t *testing.T) { if strings.Contains(tc.name, "cni") { t.Logf("WARNING: cni mode requires additional setup before pods can schedule :(") - } else if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", 2*time.Minute); err != nil { + } else if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", 4*time.Minute); err != nil { t.Fatalf("wait: %v", err) }