Pmackin/vz 2732 install loop test (#1225)

verrazzano · Jun 4, 2021 · f8ea801 · f8ea801
1 parent a0e4900
commit f8ea801
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/tests/e2e/verify-install/kubernetes/kubernetes_test.go b/tests/e2e/verify-install/kubernetes/kubernetes_test.go
@@ -15,8 +15,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var waitTimeout = 15 * time.Minute
-var pollingInterval = 30 * time.Second
+const waitTimeout = 15 * time.Minute
+const pollingInterval = 30 * time.Second
+const timeout5Min = 5 * time.Minute
+
 var expectedPodsCattleSystem = []string{
 	"rancher"}
 
@@ -72,10 +74,13 @@ var _ = ginkgo.Describe("Kubernetes Cluster",
 					gomega.Expect(nsListContains(namespaces.Items, "cattle-system")).To(gomega.BeTrue())
 					gomega.Expect(nsListContains(namespaces.Items, "local")).To(gomega.BeFalse())
 				} else {
-					gomega.Expect(nsListContains(namespaces.Items, "cattle-global-data")).To(gomega.BeTrue())
-					gomega.Expect(nsListContains(namespaces.Items, "cattle-global-nt")).To(gomega.BeTrue())
 					gomega.Expect(nsListContains(namespaces.Items, "cattle-system")).To(gomega.BeTrue())
-					gomega.Expect(nsListContains(namespaces.Items, "local")).To(gomega.BeTrue())
+					gomega.Eventually(func() bool { return nsListContains(namespaces.Items, "cattle-global-data") }, timeout5Min, pollingInterval).
+						Should(gomega.BeTrue())
+					gomega.Eventually(func() bool { return nsListContains(namespaces.Items, "cattle-global-nt") }, timeout5Min, pollingInterval).
+						Should(gomega.BeTrue())
+					gomega.Eventually(func() bool { return nsListContains(namespaces.Items, "local") }, timeout5Min, pollingInterval).
+						Should(gomega.BeTrue())
 				}
 				gomega.Expect(nsListContains(namespaces.Items, "istio-system")).To(gomega.Equal(true))
 				gomega.Expect(nsListContains(namespaces.Items, "gitlab")).To(gomega.Equal(false))