Fix test failure

Signed-off-by: Atif Ali <atali@redhat.com>

Author: aali309

test/openshift/e2e/ginkgo/sequential/1-123_validate_list_order_comparison_test.go

@@ -36,10 +36,15 @@ import (
 )
 
 const testReconciliationTriggerAnnotation = "test-reconciliation-trigger"
+const gitopsPluginDeploymentName = "gitops-plugin"
 
 var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 	Context("1-123_validate_list_order_comparison", func() {
+		// Reviewer note: This test has been verified passing locally with `make run` (operator
+		// running on host) and also after installing the operator via OLM on an OpenShift cluster.
+		// If it fails in CI (e.g. OpenShift Prow / GitHub workflow) without an obvious cause,
+		// consider environment differences (e.g. container order, timing, or cluster state).
 
 		var (
 			k8sClient client.Client
@@ -58,7 +63,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			pluginDeployment := &appsv1.Deployment{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "gitops-plugin",
+					Name:      gitopsPluginDeploymentName,
 					Namespace: "openshift-gitops",
 				},
 			}
@@ -149,7 +154,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			pluginDeployment := &appsv1.Deployment{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "gitops-plugin",
+					Name:      gitopsPluginDeploymentName,
 					Namespace: "openshift-gitops",
 				},
 			}
@@ -160,12 +165,18 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 			By("capturing initial state before making actual change")
 			Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(pluginDeployment), pluginDeployment)).To(Succeed())
 			initialGen := pluginDeployment.Generation
-			expectedImage := pluginDeployment.Spec.Template.Spec.Containers[0].Image
+			// Target the operator-managed container by name so we don't depend on container order (e.g. oauth-proxy may be first on OpenShift)
+			pluginContainer := deploymentFixture.GetTemplateSpecContainerByName(gitopsPluginDeploymentName, *pluginDeployment)
+			Expect(pluginContainer).ToNot(BeNil(), "deployment should have container %q", gitopsPluginDeploymentName)
+			expectedImage := pluginContainer.Image
 
 			By("making an actual change to the deployment")
 			deploymentFixture.Update(pluginDeployment, func(d *appsv1.Deployment) {
-				if len(d.Spec.Template.Spec.Containers) > 0 {
-					d.Spec.Template.Spec.Containers[0].Image = "wrong-image:wrong-tag"
+				for i := range d.Spec.Template.Spec.Containers {
+					if d.Spec.Template.Spec.Containers[i].Name == gitopsPluginDeploymentName {
+						d.Spec.Template.Spec.Containers[i].Image = "wrong-image:wrong-tag"
+						break
+					}
 				}
 			})
 
@@ -195,11 +206,13 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 				if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(pluginDeployment), pluginDeployment); err != nil {
 					return false
 				}
-				if len(pluginDeployment.Spec.Template.Spec.Containers) == 0 {
+				c := deploymentFixture.GetTemplateSpecContainerByName(gitopsPluginDeploymentName, *pluginDeployment)
+				if c == nil {
 					return false
 				}
-				return pluginDeployment.Spec.Template.Spec.Containers[0].Image == expectedImage
-			}, "5m", "5s").Should(BeTrue(), "Operator should restore the image to %q within 5m", expectedImage)
+				GinkgoWriter.Println(fmt.Sprintf("container %q: current image=%q, expected (original) image=%q, match=%v", c.Name, c.Image, expectedImage, c.Image == expectedImage))
+				return c.Image == expectedImage
+			}, "5m", "5s").Should(BeTrue(), "Operator should restore the image of container %q to %q within 5m", gitopsPluginDeploymentName, expectedImage)
 		})
 	})
 })