Revert upgrade test changes

Author: bjee19

tests/framework/resourcemanager.go

@@ -701,25 +701,25 @@ func GetReadyNGFPodNames(
 			"app.kubernetes.io/instance": releaseName,
 		},
 	); err != nil {
-		return nil, fmt.Errorf("error getting list of Pods: %w", err)
+		return nil, fmt.Errorf("error getting list of NGF Pods: %w", err)
 	}
 
-	if len(podList.Items) > 0 {
-		var names []string
-		for _, pod := range podList.Items {
-			for _, cond := range pod.Status.Conditions {
-				if cond.Type == core.PodReady && cond.Status == core.ConditionTrue {
-					names = append(names, pod.Name)
-				}
+	if len(podList.Items) == 0 {
+		return nil, errors.New("unable to find NGF Pod(s)")
+	}
+
+	var names []string
+	for _, pod := range podList.Items {
+		for _, cond := range pod.Status.Conditions {
+			if cond.Type == core.PodReady && cond.Status == core.ConditionTrue {
+				names = append(names, pod.Name)
 			}
 		}
-		return names, nil
 	}
-
-	return nil, errors.New("unable to find NGF Pod(s)")
+	return names, nil
 }
 
-// GetReadyNginxPodNames returns the name(s) of the Nginx Pod(s).
+// GetReadyNginxPodNames returns the name(s) of the NGINX Pod(s).
 func GetReadyNginxPodNames(
 	k8sClient client.Client,
 	namespace string,
@@ -735,22 +735,23 @@ func GetReadyNginxPodNames(
 		client.InNamespace(namespace),
 		client.HasLabels{"gateway.networking.k8s.io/gateway-name"},
 	); err != nil {
-		return nil, fmt.Errorf("error getting list of Nginx Pods: %w", err)
+		return nil, fmt.Errorf("error getting list of NGINX Pods: %w", err)
 	}
 
-	if len(podList.Items) > 0 {
-		var names []string
-		for _, pod := range podList.Items {
-			for _, cond := range pod.Status.Conditions {
-				if cond.Type == core.PodReady && cond.Status == core.ConditionTrue {
-					names = append(names, pod.Name)
-				}
+	if len(podList.Items) == 0 {
+		return nil, errors.New("unable to find NGINX Pod(s)")
+	}
+
+	var names []string
+	for _, pod := range podList.Items {
+		for _, cond := range pod.Status.Conditions {
+			if cond.Type == core.PodReady && cond.Status == core.ConditionTrue {
+				names = append(names, pod.Name)
 			}
 		}
-		return names, nil
 	}
 
-	return nil, errors.New("unable to find NGF Pod(s)")
+	return names, nil
 }
 
 func countNumberOfReadyParents(parents []v1.RouteParentStatus) int {

tests/suite/upgrade_test.go

@@ -48,18 +48,14 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
 		teardown(releaseName)
 
 		cfg := setupConfig{
-			releaseName: releaseName,
-			// chartPath:     "oci://ghcr.io/nginx/charts/nginx-gateway-fabric",
+			releaseName:   releaseName,
+			chartPath:     "oci://ghcr.io/nginx/charts/nginx-gateway-fabric",
 			gwAPIVersion:  *gatewayAPIPrevVersion,
 			deploy:        true,
 			nfr:           true,
 			debugLogLevel: true,
 		}
 
-		// cfg := getDefaultSetupCfg()
-		// cfg.gwAPIVersion = *gatewayAPIPrevVersion
-		// cfg.nfr = true
-
 		setup(cfg, "--values", valuesFile)
 
 		ns = core.Namespace{
@@ -73,13 +69,6 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
 		Expect(resourceManager.WaitForAppsToBeReady(ns.Name)).To(Succeed())
 
 		var err error
-
-		nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(nginxPodNames).To(HaveLen(1))
-
-		setUpPortForward(nginxPodNames[0], ns.Name)
-
 		resultsDir, err = framework.CreateResultsDir("ngf-upgrade", version)
 		Expect(err).ToNot(HaveOccurred())
 
@@ -90,8 +79,6 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
 	})
 
 	AfterEach(func() {
-		cleanUpPortForward()
-
 		Expect(resourceManager.DeleteFromFiles(files, ns.Name)).To(Succeed())
 		Expect(resourceManager.DeleteNamespace(ns.Name)).To(Succeed())
 		resultsFile.Close()