debug

Signed-off-by: zirain <[email protected]>

Author: zirain

test/conformance/conformance_test.go

@@ -60,6 +60,13 @@ func TestGatewayAPIConformance(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error creating conformance test suite: %v", err)
 	}
+
+	defer func() {
+		if t.Failed() {
+			ege2etest.CollectResult(t, cSuite.RestConfig)
+		}
+	}()
+
 	cSuite.Setup(t, tests.ConformanceTests)
 	if err := cSuite.Run(t, tests.ConformanceTests); err != nil {
 		t.Fatalf("Error running conformance tests: %v", err)

test/e2e/tests/utils.go

@@ -23,6 +23,7 @@ import (
 	"fortio.org/fortio/fhttp"
 	"fortio.org/fortio/periodic"
 	flog "fortio.org/log"
+	tb "github.com/envoyproxy/gateway/internal/troubleshoot"
 	"github.com/google/go-cmp/cmp"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
@@ -46,7 +47,6 @@ import (
 
 	egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
 	"github.com/envoyproxy/gateway/internal/kubernetes"
-	tb "github.com/envoyproxy/gateway/internal/troubleshoot"
 )
 
 var (
@@ -626,13 +626,16 @@ func CollectAndDump(t *testing.T, rest *rest.Config) {
 		tlog.Logf(t, "Skipping collecting and dumping cluster data, set ACTIONS_STEP_DEBUG=true to enable it")
 		return
 	}
+	CollectResult(t, rest)
+}
 
+func CollectResult(t *testing.T, rest *rest.Config) {
 	dumpedNamespaces := []string{"envoy-gateway-system"}
 	if IsGatewayNamespaceMode() {
 		dumpedNamespaces = append(dumpedNamespaces, ConformanceInfraNamespace)
 	}
 
-	result := tb.CollectResult(context.TODO(), rest, tb.CollectOptions{
+	result := tb.CollectResult(t.Context(), rest, tb.CollectOptions{
 		BundlePath:          "",
 		CollectedNamespaces: dumpedNamespaces,
 	})