From 990c190cffaacd315c0863f851f5908506cd3824 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Mon, 6 Jul 2026 13:47:39 +0530 Subject: [PATCH] update e2e tests Signed-off-by: Varsha B --- .../e2e/ginkgo/parallel/1-031_validate_toolchain_test.go | 4 ++-- .../1-051_validate_argocd_agent_principal_test.go | 7 ++++++- .../sequential/1-052_validate_argocd_agent_agent_test.go | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go index c1224337c1a..19fd0626bd5 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go @@ -87,7 +87,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { // These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix expected_kustomizeVersion := "v5.8.1" expected_helmVersion := "v3.19.4" - expected_argocdVersion := "v3.4.2" + expected_argocdVersion := "v3.4.4" var expected_dexVersion string var expected_redisVersion string @@ -100,7 +100,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { } else { // when running against RC/ released version of gitops expected_dexVersion = "v2.45.0" - expected_redisVersion = "8.2.3" + expected_redisVersion = "7.2.11" } By("locating pods containing toolchain in openshift-gitops") diff --git a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go index 6af261cbe11..ad74afb5c23 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go @@ -363,7 +363,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentPrincipalName, *principalDeployment) Expect(container).ToNot(BeNil()) - Expect(container.Image).To(Equal(common.ArgoCDAgentPrincipalDefaultImageName)) + + if fixture.EnvCI() || fixture.EnvLocalRun() || fixture.EnvNonOLM() { + Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName)) + } else { + Expect(container.Image).To(HavePrefix("registry.redhat.io/openshift-gitops-1/argocd-agent-rhel9")) + } By("Create required secrets and certificates for principal pod to start properly") diff --git a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go index 4f09dd428ee..aaee6fee75b 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go @@ -339,7 +339,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentAgentName, *agentDeployment) Expect(container).ToNot(BeNil()) - Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName)) + + if fixture.EnvCI() || fixture.EnvLocalRun() || fixture.EnvNonOLM() { + Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName)) + } else { + Expect(container.Image).To(HavePrefix("registry.redhat.io/openshift-gitops-1/argocd-agent-rhel9")) + } By("Verify environment variables are set correctly")