Skip to content

Commit ff8657c

Browse files
authored
Update check for default image (#1153)
Signed-off-by: Varsha B <vab@redhat.com>
1 parent f09d22c commit ff8657c

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
355355

356356
container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentPrincipalName, *principalDeployment)
357357
Expect(container).ToNot(BeNil())
358-
Expect(container.Image).To(Equal(common.ArgoCDAgentPrincipalDefaultImageName))
358+
359+
if fixture.EnvCI() || fixture.EnvLocalRun() || fixture.EnvNonOLM() {
360+
Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName))
361+
} else {
362+
Expect(container.Image).To(HavePrefix("registry.redhat.io/openshift-gitops-1/argocd-agent-rhel9"))
363+
}
359364

360365
By("Create required secrets and certificates for principal pod to start properly")
361366

test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
338338

339339
container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentAgentName, *agentDeployment)
340340
Expect(container).ToNot(BeNil())
341-
Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName))
341+
342+
if fixture.EnvCI() || fixture.EnvLocalRun() || fixture.EnvNonOLM() {
343+
Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName))
344+
} else {
345+
Expect(container.Image).To(HavePrefix("registry.redhat.io/openshift-gitops-1/argocd-agent-rhel9"))
346+
}
342347

343348
By("Verify environment variables are set correctly")
344349

0 commit comments

Comments
 (0)