From f2e96806db199b23abdf62620490a9ee91c537ba Mon Sep 17 00:00:00 2001 From: tstromberg Date: Mon, 23 Sep 2019 10:58:14 -0700 Subject: [PATCH 1/2] Wait longer for TestVersionUpgrade as old versions may need to retry --- test/integration/version_upgrade_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index 09de47d331ab..b73b0963adbd 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -40,7 +40,7 @@ import ( // and it tries to upgrade from the older supported k8s to news supported k8s func TestVersionUpgrade(t *testing.T) { profile := UniqueProfileName("vupgrade") - ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute) + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Minute) MaybeSlowParallel(t) defer CleanupWithLogs(t, profile, cancel) From 2241e7381543a1f337f769e58f75fd33d0bd297f Mon Sep 17 00:00:00 2001 From: tstromberg Date: Mon, 23 Sep 2019 11:00:01 -0700 Subject: [PATCH 2/2] Wait up to 55m (just short of 60m default) --- test/integration/version_upgrade_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index b73b0963adbd..6ee49cb81173 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -40,7 +40,7 @@ import ( // and it tries to upgrade from the older supported k8s to news supported k8s func TestVersionUpgrade(t *testing.T) { profile := UniqueProfileName("vupgrade") - ctx, cancel := context.WithTimeout(context.Background(), 45*time.Minute) + ctx, cancel := context.WithTimeout(context.Background(), 55*time.Minute) MaybeSlowParallel(t) defer CleanupWithLogs(t, profile, cancel)