Add nginx logs and events to report

Author: bjee19

tests/framework/info.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"runtime/debug"
 
+	. "github.com/onsi/ginkgo/v2"
 	core "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -81,3 +82,27 @@ func GetBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
 
 	return
 }
+
+// AddNginxLogsAndEventsToReport adds nginx logs and events from the namespace to the report if the spec failed.
+func AddNginxLogsAndEventsToReport(rm ResourceManager, namespace string) {
+	if CurrentSpecReport().Failed() {
+		var returnLogs string
+
+		nginxPodNames, _ := GetReadyNginxPodNames(rm.K8sClient, namespace, rm.TimeoutConfig.GetTimeout)
+
+		for _, nginxPodName := range nginxPodNames {
+			returnLogs += fmt.Sprintf("Logs for Nginx Pod %s:\n", nginxPodName)
+			nginxLogs, _ := rm.GetPodLogs(
+				namespace,
+				nginxPodName,
+				&core.PodLogOptions{Container: "nginx"},
+			)
+
+			returnLogs += fmt.Sprintf("  %s\n", nginxLogs)
+		}
+		AddReportEntry("Nginx Logs", returnLogs, ReportEntryVisibilityNever)
+
+		events := GetEvents(rm, namespace)
+		AddReportEntry("Test Events", events, ReportEntryVisibilityNever)
+	}
+}

tests/suite/advanced_routing_test.go

@@ -48,6 +48,7 @@ var _ = Describe("AdvancedRouting", Ordered, Label("functional", "routing"), fun
 	})
 
 	AfterAll(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 		cleanUpPortForward()
 
 		Expect(resourceManager.DeleteFromFiles(files, namespace)).To(Succeed())

tests/suite/client_settings_test.go

@@ -57,6 +57,7 @@ var _ = Describe("ClientSettingsPolicy", Ordered, Label("functional", "cspolicy"
 	})
 
 	AfterAll(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 		cleanUpPortForward()
 
 		Expect(resourceManager.DeleteNamespace(namespace)).To(Succeed())

tests/suite/dataplane_perf_test.go

@@ -88,6 +88,7 @@ var _ = Describe("Dataplane performance", Ordered, Label("nfr", "performance"),
 	})
 
 	AfterAll(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 		cleanUpPortForward()
 
 		Expect(resourceManager.DeleteFromFiles(files, namespace)).To(Succeed())

tests/suite/graceful_recovery_test.go

@@ -425,6 +425,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
 	})
 
 	AfterAll(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, ns.Name)
 		cleanUpPortForward()
 		Expect(resourceManager.DeleteFromFiles(files, ns.Name)).To(Succeed())
 		Expect(resourceManager.DeleteNamespace(ns.Name)).To(Succeed())

tests/suite/longevity_test.go

@@ -82,6 +82,7 @@ var _ = Describe("Longevity", Label("longevity-setup", "longevity-teardown"), fu
 		Expect(writeTrafficResults(resultsFile, homeDir, "coffee.txt", "HTTP")).To(Succeed())
 		Expect(writeTrafficResults(resultsFile, homeDir, "tea.txt", "HTTPS")).To(Succeed())
 
+		framework.AddNginxLogsAndEventsToReport(resourceManager, ns.Name)
 		Expect(resourceManager.DeleteFromFiles(files, ns.Name)).To(Succeed())
 		Expect(resourceManager.DeleteNamespace(ns.Name)).To(Succeed())
 	})

tests/suite/reconfig_test.go

@@ -437,6 +437,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 	})
 
 	AfterEach(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, reconfigNamespace.Name)
+
 		Expect(cleanupResources()).Should(Succeed())
 		teardown(releaseName)
 	})

tests/suite/sample_test.go

@@ -46,6 +46,7 @@ var _ = Describe("Basic test example", Label("functional"), func() {
 	})
 
 	AfterEach(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 		cleanUpPortForward()
 
 		Expect(resourceManager.DeleteFromFiles(files, namespace)).To(Succeed())

tests/suite/scale_test.go

@@ -682,6 +682,7 @@ The logs are attached only if there are errors.
 	})
 
 	AfterEach(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 		cleanUpPortForward()
 		Expect(resourceManager.DeleteNamespace(namespace)).To(Succeed())
 		teardown(releaseName)
@@ -900,6 +901,7 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
 			})
 
 			AfterAll(func() {
+				framework.AddNginxLogsAndEventsToReport(resourceManager, ns.Name)
 				cleanUpPortForward()
 
 				teardown(releaseName)

tests/suite/snippets_filter_test.go

@@ -67,6 +67,7 @@ var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter
 		})
 
 		AfterAll(func() {
+			framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 			Expect(resourceManager.DeleteFromFiles(snippetsFilter, namespace)).To(Succeed())
 		})
 

tests/suite/system_suite_test.go

@@ -348,7 +348,7 @@ var _ = AfterSuite(func() {
 	AddReportEntry("Events", events, ReportEntryVisibilityNever)
 
 	logs = framework.GetLogs(resourceManager, ngfNamespace, releaseName)
-	AddReportEntry("Logs", logs, ReportEntryVisibilityNever)
+	AddReportEntry("NGF Logs", logs, ReportEntryVisibilityNever)
 
 	labelFilter := GinkgoLabelFilter()
 	if !strings.Contains(labelFilter, "longevity-setup") {

tests/suite/tracing_test.go

@@ -110,6 +110,7 @@ var _ = Describe("Tracing", FlakeAttempts(2), Ordered, Label("functional", "trac
 	})
 
 	AfterEach(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 		output, err := framework.UninstallCollector(resourceManager)
 		Expect(err).ToNot(HaveOccurred(), string(output))
 

tests/suite/upgrade_test.go

@@ -83,6 +83,7 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
 	})
 
 	AfterEach(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, ns.Name)
 		cleanUpPortForward()
 
 		Expect(resourceManager.DeleteFromFiles(files, ns.Name)).To(Succeed())

tests/suite/upstream_settings_test.go

@@ -61,6 +61,7 @@ var _ = Describe("UpstreamSettingsPolicy", Ordered, Label("functional", "uspolic
 	})
 
 	AfterAll(func() {
+		framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
 		cleanUpPortForward()
 
 		Expect(resourceManager.DeleteNamespace(namespace)).To(Succeed())