removed unwanted code from imagepullpolicy ginkgo test case

Signed-off-by: Alka Kumari <alkumari@redhat.com>

Author: alkakumari016

test/openshift/e2e/ginkgo/fixture/fixture.go

@@ -636,61 +636,6 @@ func WaitForAllDeploymentsInTheNamespaceToBeReady(ns string, k8sClient client.Cl
 
 }
 
-func AddEnvVarToCSV(csv *olmv1alpha1.ClusterServiceVersion, envKey string, value string) {
-	containers := csv.Spec.InstallStrategy.StrategySpec.DeploymentSpecs[0].Spec.Template.Spec.Containers
-	for i := range containers {
-		found := false
-		for j := range containers[i].Env {
-			if containers[i].Env[j].Name == envKey {
-				containers[i].Env[j].Value = value
-				found = true
-				break
-			}
-		}
-		if !found {
-			containers[i].Env = append(containers[i].Env, corev1.EnvVar{Name: envKey, Value: value})
-		}
-	}
-}
-
-// WaitForOperatorPodToHaveEnvVar waits for the operator pod to have the specified environment variable with the expected value.
-// This ensures that after updating the subscription, the operator pod has actually restarted with the new env var.
-func WaitForOperatorPodToHaveEnvVar(ns string, envKey string, expectedValue string, k8sClient client.Client) {
-	Eventually(func() bool {
-		var deplList appsv1.DeploymentList
-		if err := k8sClient.List(context.Background(), &deplList, client.InNamespace(ns)); err != nil {
-			GinkgoWriter.Println(err)
-			return false
-		}
-
-		for _, depl := range deplList.Items {
-			// Look for the operator deployment (typically contains "controller-manager" or "operator")
-			if !strings.Contains(depl.Name, "operator") && !strings.Contains(depl.Name, "controller-manager") {
-				continue
-			}
-
-			// Check if the deployment's pod template has the expected env var
-			for _, container := range depl.Spec.Template.Spec.Containers {
-				for _, env := range container.Env {
-					if env.Name == envKey {
-						if env.Value == expectedValue {
-							// Found the env var with the expected value
-							// Now verify the deployment is fully rolled out with this change
-							if depl.Generation == depl.Status.ObservedGeneration &&
-								depl.Status.Replicas == depl.Status.ReadyReplicas &&
-								depl.Status.UpdatedReplicas == depl.Status.Replicas {
-								return true
-							}
-						}
-						break
-					}
-				}
-			}
-		}
-		return false
-	}, "5m", "5s").Should(BeTrue())
-}
-
 func WaitForAllStatefulSetsInTheNamespaceToBeReady(ns string, k8sClient client.Client) {
 
 	Eventually(func() bool {

test/openshift/e2e/ginkgo/sequential/1-115_validate_imagepullpolicy_console_plugin_test.go

@@ -19,7 +19,6 @@ package sequential
 import (
 	"context"
 	"fmt"
-	"os"
 	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -280,14 +279,11 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("adding image pull policy env variable IMAGE_PULL_POLICY in Subscription")
 
-			fixture.AddEnvVarToCSV(csv, "IMAGE_PULL_POLICY", "Always")
-			//fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Always")
-			Expect(k8sClient.Update(ctx, csv)).To(Succeed())
+			fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Always")
 			defer func() {
 				By("removing IMAGE_PULL_POLICY environment variable to restore default behavior")
 				fixture.RestoreSubcriptionToDefault()
 			}()
-			fixture.WaitForOperatorPodToHaveEnvVar("openshift-gitops-operator", "IMAGE_PULL_POLICY", "Always", k8sClient)
 
 			By("verifying Argo CD in openshift-gitops exists and is available")
 			argoCD, err := argocdFixture.GetOpenShiftGitOpsNSArgoCD()
@@ -302,17 +298,33 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			}
 			Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(gitopsService), gitopsService)).To(Succeed())
 
+			By("printing deployment ImagePullPolicy")
+			deployment := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "openshift-gitops"}}
+			for _, container := range deployment.Spec.Template.Spec.Containers {
+				fmt.Println("Container: " + container.Name + " is " + string(container.ImagePullPolicy))
+			}
+
 			By("verifying backend deployment has ImagePullPolicy set based on env variable")
 			clusterDepl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: argoCD.Namespace}}
 			Eventually(clusterDepl).Should(k8sFixture.ExistByName())
+			fmt.Println("Printing the list of deployment env variables")
+			envList := clusterDepl.Spec.Template.Spec.Containers[0].Env
+			for _, env := range envList {
+				fmt.Println("Env: " + env.Name + " is " + env.Value)
+			}
+
+			envValue, err := fixture.GetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY")
+			Expect(err).ToNot(HaveOccurred())
+			fmt.Println("EnvValue: " + string(*envValue))
+
 			Eventually(func() bool {
 				err := k8sClient.Get(ctx, client.ObjectKeyFromObject(clusterDepl), clusterDepl)
 				if err != nil {
 					return false
 				}
 				for _, container := range clusterDepl.Spec.Template.Spec.Containers {
 					if container.ImagePullPolicy != corev1.PullAlways {
-						fmt.Println("ImagePullPolicy is set to " + string(container.ImagePullPolicy) + " but expected " + os.Getenv("IMAGE_PULL_POLICY"))
+						fmt.Println("ImagePullPolicy is set to " + string(container.ImagePullPolicy))
 						return false
 					}
 				}
@@ -338,14 +350,11 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 
 			By("updating image pull policy env variable to Never")
 
-			//fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Never")
-			fixture.AddEnvVarToCSV(csv, "IMAGE_PULL_POLICY", "Never")
-			Expect(k8sClient.Update(ctx, csv)).To(Succeed())
+			fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "Never")
 			defer func() {
 				By("removing IMAGE_PULL_POLICY environment variable to restore default behavior")
 				fixture.RestoreSubcriptionToDefault()
 			}()
-			fixture.WaitForOperatorPodToHaveEnvVar("openshift-gitops-operator", "IMAGE_PULL_POLICY", "Never", k8sClient)
 
 			By("verifying backend deployment has ImagePullPolicy changed based on env variable")
 			Eventually(func() bool {
@@ -376,14 +385,11 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				return true
 			}, "3m", "5s").Should(BeTrue())
 
-			//fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "IfNotPresent")
-			fixture.AddEnvVarToCSV(csv, "IMAGE_PULL_POLICY", "IfNotPresent")
-			Expect(k8sClient.Update(ctx, csv)).To(Succeed())
+			fixture.SetEnvInOperatorSubscriptionOrDeployment("IMAGE_PULL_POLICY", "IfNotPresent")
 			defer func() {
 				By("removing IMAGE_PULL_POLICY environment variable to restore default behavior")
 				fixture.RestoreSubcriptionToDefault()
 			}()
-			fixture.WaitForOperatorPodToHaveEnvVar("openshift-gitops-operator", "IMAGE_PULL_POLICY", "IfNotPresent", k8sClient)
 
 			By("verifying backend deployment has ImagePullPolicy changed based on env variable")
 			Eventually(func() bool {