Merge pull request #4891 from jupdec/eks-auto-tests-v2

refactor: making tests configurable to run on eks auto framework

Author: kubernetes-prow[bot]

test/e2e/gateway/alb_tests/alb_gateway_suite_test.go

@@ -3,21 +3,15 @@ package alb_tests
 import (
 	"testing"
 
-	"sigs.k8s.io/aws-load-balancer-controller/v3/test/framework"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var tf *framework.Framework
-
 func TestALBGateway(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "ALB Gateway Suite")
 }
 
 var _ = BeforeSuite(func() {
-	var err error
-	tf, err = framework.InitFramework()
-	Expect(err).NotTo(HaveOccurred())
+	Expect(InitTF()).To(Succeed())
 })

…ay/alb_tests/alb_instance_target_test.go …gateway/alb_tests/alb_instance_target.gotest/e2e/gateway/alb_tests/alb_instance_target_test.go renamed to test/e2e/gateway/alb_tests/alb_instance_target.go test/e2e/gateway/alb_tests/alb_instance_target_test.go renamed to test/e2e/gateway/alb_tests/alb_instance_target.go

@@ -2083,4 +2083,4 @@ var _ = Describe("test k8s alb gateway using instance targets reconciled by the
 			})
 		})
 	})
-})
+})

…/gateway/alb_tests/alb_ip_target_test.go …t/e2e/gateway/alb_tests/alb_ip_target.gotest/e2e/gateway/alb_tests/alb_ip_target_test.go renamed to test/e2e/gateway/alb_tests/alb_ip_target.go test/e2e/gateway/alb_tests/alb_ip_target_test.go renamed to test/e2e/gateway/alb_tests/alb_ip_target.go

@@ -2499,4 +2499,4 @@ var _ = Describe("test k8s alb gateway using ip targets reconciled by the aws lo
 			})
 		})
 	})
-})
+})

test/e2e/gateway/alb_tests/alb_test_helper.go

@@ -131,7 +131,7 @@ func (s *ALBTestStack) DeployHTTPWithDefaultTGC(ctx context.Context, f *framewor
 }
 
 func (s *ALBTestStack) deploy(ctx context.Context, f *framework.Framework, gwListeners []gwv1.Listener, httprs []*gwv1.HTTPRoute, grpcrs []*gwv1.GRPCRoute, dps []*appsv1.Deployment, svcs []*corev1.Service, lbConfSpec elbv2gw.LoadBalancerConfigurationSpec, tgcs []*elbv2gw.TargetGroupConfiguration, lrConfSpec elbv2gw.ListenerRuleConfigurationSpec, secret *testOIDCSecret, readinessGateEnabled bool) error {
-	gwc := test_resources.BuildGatewayClassSpec("gateway.k8s.aws/alb")
+	gwc := test_resources.BuildGatewayClassSpec(test_resources.ALBGatewayControllerName)
 	gw := test_resources.BuildBasicGatewaySpec(gwc, gwListeners)
 	lbc := test_resources.BuildLoadBalancerConfig(f, lbConfSpec)
 	lrc := test_resources.BuildListenerRuleConfig(test_resources.DefaultLRConfigName, lrConfSpec)

…ateway/alb_tests/alb_trust_store_test.go …e2e/gateway/alb_tests/alb_trust_store.gotest/e2e/gateway/alb_tests/alb_trust_store_test.go renamed to test/e2e/gateway/alb_tests/alb_trust_store.go test/e2e/gateway/alb_tests/alb_trust_store_test.go renamed to test/e2e/gateway/alb_tests/alb_trust_store.go

@@ -358,4 +358,4 @@ var _ = Describe("test ALB Gateway with Trust Store for mTLS", func() {
 			})
 		})
 	})
-})
+})

test/e2e/gateway/alb_tests/state.go

@@ -0,0 +1,17 @@
+package alb_tests
+
+import "sigs.k8s.io/aws-load-balancer-controller/v3/test/framework"
+
+var tf *framework.Framework
+
+// InitTF initializes the package-level framework. Idempotent so a parent test binary
+// that blank-imports multiple gateway e2e packages can call it once per package from a
+// consolidated BeforeSuite without racing framework state.
+func InitTF() error {
+	if tf != nil {
+		return nil
+	}
+	var err error
+	tf, err = framework.InitFramework()
+	return err
+}

…ay/chained_gateway_tests/alb_nlb_test.go …gateway/chained_gateway_tests/alb_nlb.gotest/e2e/gateway/chained_gateway_tests/alb_nlb_test.go renamed to test/e2e/gateway/chained_gateway_tests/alb_nlb.go test/e2e/gateway/chained_gateway_tests/alb_nlb_test.go renamed to test/e2e/gateway/chained_gateway_tests/alb_nlb.go

@@ -275,4 +275,4 @@ var _ = Describe("test combined ALB and NLB gateways with HTTPRoute and TCPRoute
 			})
 		})
 	})
-})
+})

test/e2e/gateway/chained_gateway_tests/chained_gateway_suite_test.go

@@ -3,21 +3,20 @@ package chained_gateway_tests
 import (
 	"testing"
 
-	"sigs.k8s.io/aws-load-balancer-controller/v3/test/framework"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"sigs.k8s.io/aws-load-balancer-controller/v3/test/e2e/gateway/alb_tests"
+	"sigs.k8s.io/aws-load-balancer-controller/v3/test/e2e/gateway/nlb_tests"
 )
 
-var tf *framework.Framework
-
 func TestChainedGateway(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Chained Gateway Suite")
 }
 
 var _ = BeforeSuite(func() {
-	var err error
-	tf, err = framework.InitFramework()
-	Expect(err).NotTo(HaveOccurred())
+	Expect(InitTF()).To(Succeed())
+	// Init imported packages' tf; their Describes are transitively registered here.
+	Expect(alb_tests.InitTF()).To(Succeed())
+	Expect(nlb_tests.InitTF()).To(Succeed())
 })

test/e2e/gateway/chained_gateway_tests/state.go

@@ -0,0 +1,17 @@
+package chained_gateway_tests
+
+import "sigs.k8s.io/aws-load-balancer-controller/v3/test/framework"
+
+var tf *framework.Framework
+
+// InitTF initializes the package-level framework. Idempotent so a parent test binary
+// that blank-imports multiple gateway e2e packages can call it once per package from a
+// consolidated BeforeSuite without racing framework state.
+func InitTF() error {
+	if tf != nil {
+		return nil
+	}
+	var err error
+	tf, err = framework.InitFramework()
+	return err
+}

test/e2e/gateway/listenerset_tests/gateway_listenerset_suite_test.go

@@ -3,21 +3,15 @@ package listenerset_tests
 import (
 	"testing"
 
-	"sigs.k8s.io/aws-load-balancer-controller/v3/test/framework"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var tf *framework.Framework
-
 func TestGatewayListenerSet(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "ListenerSet Gateway Suite")
 }
 
 var _ = BeforeSuite(func() {
-	var err error
-	tf, err = framework.InitFramework()
-	Expect(err).NotTo(HaveOccurred())
+	Expect(InitTF()).To(Succeed())
 })