Update

Author: jgwest

test/openshift/e2e/ginkgo/parallel/1-003_alpha_to_beta_sso_conflict_conversion_test.go

@@ -93,7 +93,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("verifying expected Argo CD is running, that SSO status has failed, and has the expected values via the v1beta1 API")
 
-			Eventually(argoCDbeta1, "4m", "5s").Should(argocdFixture.BeAvailable())
 			Eventually(argoCDbeta1, "2m", "5s").Should(
 				And(argocdFixture.HaveSSOStatus("Failed")))
 

test/openshift/e2e/ginkgo/parallel/1-043_validate_log_level_format_test.go

@@ -67,7 +67,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
 
 			By("waiting for ArgoCD CR to be reconciled and the instance to be ready")
-			Eventually(argoCD, "3m", "5s").Should(argocdFixture.BeAvailable())
+			Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
 
 			By("enabling debug loglevel and json logformat on various Argo CD workloads")
 			argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {

test/openshift/e2e/ginkgo/parallel/1-044_validate_resource_limit_changes_test.go

@@ -99,7 +99,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
 
 			By("waiting for ArgoCD CR to be reconciled and the instance to be ready")
-			Eventually(argoCD, "3m", "5s").Should(argocdFixture.BeAvailable())
+			Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
 
 			By("updating CPU limit to 2 on every component")
 			argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {

test/openshift/e2e/ginkgo/parallel/1-083_validate_resource_customization_subkeys_test.go

@@ -148,7 +148,7 @@ spec:
 			Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())
 
 			By("waiting for ArgoCD CR to be reconciled and the instance to be ready")
-			Eventually(argoCD, "3m", "5s").Should(argocdFixture.BeAvailable())
+			Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable())
 
 			By("waiting for each of the .data fields of argocd-cm ConfigMap to have expected value")
 			configMap := &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "argocd-cm", Namespace: ns.Name}}

test/openshift/e2e/ginkgo/sequential/1-050_validate_sso_test.go

@@ -116,7 +116,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			})
 
 			By("verifying that with keycloak, Argo CD becomes available but SSO is failed")
-			Eventually(newArgoCD, "3m", "5s").Should(argocdFixture.BeAvailable())
+			Eventually(newArgoCD, "3m", "5s").Should(argocdFixture.HavePhase("Pending"))
 			Eventually(newArgoCD, "3m", "5s").Should(argocdFixture.HaveSSOStatus("Failed"))
 			By("verifying keycloak DeploymentConfigs are not used")