Breakout Annotations E2E into 2 groups

Signed-off-by: Derek Nola <derek.nola@suse.com>

Author: dereknola

.github/workflows/release.yml

@@ -72,8 +72,8 @@ jobs:
       fail-fast: true
       matrix:
         focus: 
-          - Annotations
-          - Settings
+          - Annotations_B
+          - "Annotations_A|Settings"
           - "Admission|Cgroups|Default Backend|Disable Leader|Endpointslices|Flag|TCP"
           - "Ingress|Lua|Memory Leak|metrics|Security|Service|Shutdown|SSL|Status|TopologyHints"
     steps:

test/e2e/annotations/affinity.go

@@ -40,7 +40,7 @@ const (
 	defaultHost        = "foo.com"
 )
 
-var _ = framework.DescribeAnnotation("affinity session-cookie-name", func() {
+var _ = framework.DescribeAnnotationB("affinity session-cookie-name", func() {
 	f := framework.NewDefaultFramework("affinity")
 
 	ginkgo.BeforeEach(func() {

test/e2e/annotations/affinitymode.go

@@ -30,7 +30,7 @@ import (
 
 const sslRedirectValue = "false"
 
-var _ = framework.DescribeAnnotation("affinitymode", func() {
+var _ = framework.DescribeAnnotationB("affinitymode", func() {
 	f := framework.NewDefaultFramework("affinity")
 
 	ginkgo.It("Balanced affinity mode should balance", func() {

test/e2e/annotations/alias.go

@@ -28,7 +28,7 @@ import (
 
 const fooHost = "foo"
 
-var _ = framework.DescribeAnnotation("server-alias", func() {
+var _ = framework.DescribeAnnotationB("server-alias", func() {
 	f := framework.NewDefaultFramework("alias")
 
 	ginkgo.BeforeEach(func() {

test/e2e/annotations/approot.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-nginx/test/e2e/framework"
 )
 
-var _ = framework.DescribeAnnotation("app-root", func() {
+var _ = framework.DescribeAnnotationB("app-root", func() {
 	f := framework.NewDefaultFramework("approot")
 
 	ginkgo.BeforeEach(func() {

test/e2e/annotations/auth.go

@@ -42,7 +42,7 @@ const (
 	authURL       = "http://foo.bar.baz:5000/path"
 )
 
-var _ = framework.DescribeAnnotation("auth-*", func() {
+var _ = framework.DescribeAnnotationB("auth-*", func() {
 	f := framework.NewDefaultFramework("auth", framework.WithHTTPBunEnabled())
 
 	ginkgo.BeforeEach(func() {

test/e2e/annotations/authtls.go

@@ -28,7 +28,7 @@ import (
 
 const authTLSFooHost = "authtls.foo.com"
 
-var _ = framework.DescribeAnnotation("auth-tls-*", func() {
+var _ = framework.DescribeAnnotationB("auth-tls-*", func() {
 	f := framework.NewDefaultFramework("authtls")
 
 	ginkgo.BeforeEach(func() {

test/e2e/annotations/modsecurity/modsecurity.go

@@ -36,7 +36,7 @@ const (
 		SecRule REQUEST_HEADERS:User-Agent \"block-ua\" \"log,deny,id:107,status:403,msg:\'UA blocked\'\"`
 )
 
-var _ = framework.DescribeAnnotation("modsecurity owasp", func() {
+var _ = framework.DescribeAnnotationB("modsecurity owasp", func() {
 	f := framework.NewDefaultFramework("modsecuritylocation")
 
 	ginkgo.BeforeEach(func() {

test/e2e/framework/framework.go

@@ -225,7 +225,13 @@ func IngressNginxDescribeSerial(text string, body func()) bool {
 
 // DescribeAnnotation wrapper function for ginkgo describe. Adds namespacing.
 func DescribeAnnotation(text string, body func()) bool {
-	return ginkgo.Describe("[Annotations] "+text, body)
+	return ginkgo.Describe("[Annotations_A] "+text, body)
+}
+
+// DescribeAnnotationB wrapper function for ginkgo describe. Adds namespacing.
+// Used to breakup annotation into smaller test groups
+func DescribeAnnotationB(text string, body func()) bool {
+	return ginkgo.Describe("[Annotations_B] "+text, body)
 }
 
 // DescribeSetting wrapper function for ginkgo describe. Adds namespacing.