refactor: consolidate CRD imports and focus on ApisixRoute tests

dspo · dspo · commit e73f55d37d58 · 2025-07-07T14:49:31.000+08:00
diff --git a/test/e2e/apisix/e2e_test.go b/test/e2e/apisix/e2e_test.go
@@ -24,8 +24,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds/v1alpha1"
-	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds/v2"
+	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/gatewayapi"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/ingress"
diff --git a/test/e2e/apisix/route.go b/test/e2e/apisix/route.go
@@ -34,7 +34,7 @@ import (
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = Describe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixroute"), func() {
+var _ = FDescribe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixroute"), func() {
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -25,8 +25,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/api7"
-	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds/v1alpha1"
-	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds/v2"
+	_ "github.com/apache/apisix-ingress-controller/test/e2e/crds"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/gatewayapi"
 	_ "github.com/apache/apisix-ingress-controller/test/e2e/ingress"

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import (`
`34`	`34`	`"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"`
`35`	`35`	`)`
`36`	`36`
`37`		`-var _ = Describe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixroute"), func() {`
	`37`	`+var _ = FDescribe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixroute"), func() {`
`38`	`38`	`var (`
`39`	`39`	`s = scaffold.NewScaffold(&scaffold.Options{`
`40`	`40`	`ControllerName: "apisix.apache.org/apisix-ingress-controller",`