Change timeouts on getting nginx pod names

Author: bjee19

tests/framework/info.go

@@ -88,7 +88,7 @@ func AddNginxLogsAndEventsToReport(rm ResourceManager, namespace string) {
 	if CurrentSpecReport().Failed() {
 		var returnLogs string
 
-		nginxPodNames, _ := GetReadyNginxPodNames(rm.K8sClient, namespace, rm.TimeoutConfig.GetTimeout)
+		nginxPodNames, _ := GetReadyNginxPodNames(rm.K8sClient, namespace, rm.TimeoutConfig.GetStatusTimeout)
 
 		for _, nginxPodName := range nginxPodNames {
 			returnLogs += fmt.Sprintf("Logs for Nginx Pod %s:\n", nginxPodName)

tests/suite/reconfig_test.go

@@ -327,7 +327,11 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 				var nginxPodNames []string
 				Eventually(
 					func() bool {
-						nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, reconfigNamespace.Name, timeoutConfig.GetTimeout)
+						nginxPodNames, err = framework.GetReadyNginxPodNames(
+							k8sClient,
+							reconfigNamespace.Name,
+							timeoutConfig.GetStatusTimeout,
+						)
 						return len(nginxPodNames) == 1 && err == nil
 					}).
 					WithTimeout(timeoutConfig.CreateTimeout).
@@ -337,8 +341,6 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 				nginxPodName := nginxPodNames[0]
 				Expect(nginxPodName).ToNot(BeEmpty())
 
-				// FIXME (bjee19): https://github.com/nginx/nginx-gateway-fabric/issues/2374
-				// Find a way to calculate time to ready metrics without having to rely on specific log lines.
 				timeToReadyTotal := calculateTimeToReadyTotal(nginxPodName, startTime, resourceCount)
 
 				nginxErrorLogs := getNginxErrorLogs(nginxPodNames[0], reconfigNamespace.Name)
@@ -384,7 +386,11 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 				var nginxPodNames []string
 				Eventually(
 					func() bool {
-						nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, reconfigNamespace.Name, timeoutConfig.GetTimeout)
+						nginxPodNames, err = framework.GetReadyNginxPodNames(
+							k8sClient,
+							reconfigNamespace.Name,
+							timeoutConfig.GetStatusTimeout,
+						)
 						return len(nginxPodNames) == 1 && err == nil
 					}).
 					WithTimeout(timeoutConfig.CreateTimeout).

tests/suite/scale_test.go

@@ -345,7 +345,7 @@ The logs are attached only if there are errors.
 			[]string{`"logger":"usageReporter`}, // ignore usageReporter errors
 		)
 
-		nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetTimeout)
+		nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetStatusTimeout)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(nginxPodNames).To(HaveLen(1))
 
@@ -418,7 +418,7 @@ The logs are attached only if there are errors.
 				var nginxPodNames []string
 				Eventually(
 					func() bool {
-						nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetTimeout)
+						nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetStatusTimeout)
 						return len(nginxPodNames) == 1 && err == nil
 					}).
 					WithTimeout(timeoutConfig.CreateTimeout).
@@ -472,7 +472,7 @@ The logs are attached only if there are errors.
 		var err error
 		Eventually(
 			func() bool {
-				nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetTimeout)
+				nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetStatusTimeout)
 				return len(nginxPodNames) == 1 && err == nil
 			}).
 			WithTimeout(timeoutConfig.CreateTimeout).
@@ -619,7 +619,7 @@ The logs are attached only if there are errors.
 		var err error
 		Eventually(
 			func() bool {
-				nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetTimeout)
+				nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetStatusTimeout)
 				return len(nginxPodNames) == 1 && err == nil
 			}).
 			WithTimeout(timeoutConfig.CreateTimeout).
@@ -885,7 +885,7 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
 				var err error
 				Eventually(
 					func() bool {
-						nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
+						nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetStatusTimeout)
 						return len(nginxPodNames) == 1 && err == nil
 					}).
 					WithTimeout(timeoutConfig.CreateTimeout).

tests/suite/upgrade_test.go

@@ -67,7 +67,7 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
 		Expect(resourceManager.ApplyFromFiles(files, ns.Name)).To(Succeed())
 		Expect(resourceManager.WaitForAppsToBeReady(ns.Name)).To(Succeed())
 
-		nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
+		nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetStatusTimeout)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(nginxPodNames).To(HaveLen(1))