test(e2e): switch eventually to consistently and wait for argocd available

Signed-off-by: Jonathan West <jgwest@gmail.com>

Author: jgwest

tests/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go

@@ -946,10 +946,16 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			argoCD.Spec.DefaultClusterScopedRoleDisabled = true
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
 
+			By("Verify Argo CD CR is reconciled")
+			Eventually(principalDeployment).Should(k8sFixture.ExistByName())
+
 			By("Verify ClusterRole and ClusterRoleBinding do not exist")
 			Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName())
 			Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName())
 
+			Consistently(clusterRole, "15s", "2s").Should(k8sFixture.NotExistByName())
+			Consistently(clusterRoleBinding, "15s", "2s").Should(k8sFixture.NotExistByName())
+
 			By("Namespaced RBAC objects should still exist")
 			Eventually(role, "60s", "2s").Should(k8sFixture.ExistByName())
 			Eventually(roleBinding, "60s", "2s").Should(k8sFixture.ExistByName())
@@ -967,6 +973,8 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			})
 			Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName())
 			Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName())
+			Consistently(clusterRole, "10s", "2s").Should(k8sFixture.NotExistByName())
+			Consistently(clusterRoleBinding, "10s", "2s").Should(k8sFixture.NotExistByName())
 		})
 	})
 })

tests/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go

@@ -628,9 +628,14 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			argoCD.Spec.DefaultClusterScopedRoleDisabled = true
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
 
+			By("Verify Argo CD becomes available")
+			Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
+
 			By("Verify ClusterRole and ClusterRoleBinding do not exist")
 			Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName())
 			Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName())
+			Consistently(clusterRole, "15s", "2s").Should(k8sFixture.NotExistByName())
+			Consistently(clusterRoleBinding, "15s", "2s").Should(k8sFixture.NotExistByName())
 
 			By("Namespaced RBAC objects should still exist")
 			Eventually(role, "60s", "2s").Should(k8sFixture.ExistByName())
@@ -649,6 +654,8 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			})
 			Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName())
 			Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName())
+			Consistently(clusterRole, "10s", "2s").Should(k8sFixture.NotExistByName())
+			Consistently(clusterRoleBinding, "10s", "2s").Should(k8sFixture.NotExistByName())
 		})
 	})
 })