e2e: label RouteAdvertisement test cases & skip extended ones

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>

Author: jcaamano

test/e2e/feature/features.go

@@ -23,6 +23,7 @@ var (
 	MultiHoming           = New("MultiHoming")
 	NodeIPMACMigration    = New("NodeIPMACMigration")
 	OVSCPUPin             = New("OVSCPUPin")
+	RouteAdvertisements   = New("RouteAdvertisements")
 	Unidle                = New("Unidle")
 )
 

test/e2e/label/label.go

@@ -40,3 +40,11 @@ func processOverrides(s string) string {
 	}
 	return overRide
 }
+
+// Extended returns a label used to label extended feature tests. This label
+// might be used to label feature tests that are considered not to be testing
+// the core functionality of a feature and that might be filtered out for
+// various reasons like for example to keep selected job run times down.
+func Extended() ginkgo.Labels {
+	return ginkgo.Label("EXTENDED")
+}

test/e2e/route_advertisements.go

@@ -21,9 +21,11 @@ import (
 	udnv1 "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/userdefinednetwork/v1"
 	udnclientset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/userdefinednetwork/v1/apis/clientset/versioned"
 	"github.com/ovn-org/ovn-kubernetes/test/e2e/deploymentconfig"
+	"github.com/ovn-org/ovn-kubernetes/test/e2e/feature"
 	"github.com/ovn-org/ovn-kubernetes/test/e2e/images"
 	"github.com/ovn-org/ovn-kubernetes/test/e2e/infraprovider"
 	infraapi "github.com/ovn-org/ovn-kubernetes/test/e2e/infraprovider/api"
+	"github.com/ovn-org/ovn-kubernetes/test/e2e/label"
 
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
@@ -53,7 +55,7 @@ const (
 	bgpExternalNetworkName = "bgpnet"
 )
 
-var _ = ginkgo.Describe("BGP: Pod to external server when default podNetwork is advertised", func() {
+var _ = ginkgo.Describe("BGP: Pod to external server when default podNetwork is advertised", feature.RouteAdvertisements, func() {
 	var serverContainerIPs []string
 	var frrContainerIPv4, frrContainerIPv6 string
 	var nodes *corev1.NodeList
@@ -248,7 +250,7 @@ var _ = ginkgo.Describe("BGP: Pod to external server when default podNetwork is
 	})
 })
 
-var _ = ginkgo.Describe("BGP: Pod to external server when CUDN network is advertised", func() {
+var _ = ginkgo.Describe("BGP: Pod to external server when CUDN network is advertised", feature.RouteAdvertisements, func() {
 	var serverContainerIPs []string
 	var frrContainerIPv4, frrContainerIPv6 string
 	var nodes *corev1.NodeList
@@ -525,7 +527,7 @@ var _ = ginkgo.Describe("BGP: Pod to external server when CUDN network is advert
 	)
 })
 
-var _ = ginkgo.DescribeTableSubtree("BGP: isolation between advertised networks",
+var _ = ginkgo.DescribeTableSubtree("BGP: isolation between advertised networks", feature.RouteAdvertisements,
 	func(cudnATemplate, cudnBTemplate *udnv1.ClusterUserDefinedNetwork) {
 		const curlConnectionTimeoutCode = "28"
 		const (
@@ -1068,7 +1070,7 @@ var _ = ginkgo.DescribeTableSubtree("BGP: isolation between advertised networks"
 	),
 )
 
-var _ = ginkgo.Describe("BGP: For a VRF-Lite configured network", func() {
+var _ = ginkgo.Describe("BGP: For a VRF-Lite configured network", feature.RouteAdvertisements, func() {
 
 	// testing helpers used throughout this testing node
 	const (
@@ -1545,12 +1547,14 @@ var _ = ginkgo.Describe("BGP: For a VRF-Lite configured network", func() {
 
 					otherNetworksToTest := []ginkgo.TableEntry{
 						ginkgo.Entry("Default", defaultNetwork, nil),
-						ginkgo.Entry("Layer 3 UDN non advertised", udn, otherLayer3NetworkSpec),
-						ginkgo.Entry("Layer 3 CUDN advertised", cudnAdvertised, otherLayer3NetworkSpec),
 						ginkgo.Entry("Layer 3 CUDN advertised VRF-Lite", cudnAdvertisedVRFLite, otherLayer3NetworkSpec),
-						ginkgo.Entry("Layer 2 UDN non advertised", udn, otherLayer2NetworkSpec),
-						ginkgo.Entry("Layer 2 CUDN advertised", cudnAdvertised, otherLayer2NetworkSpec),
 						ginkgo.Entry("Layer 2 CUDN advertised VRF-Lite", cudnAdvertisedVRFLite, otherLayer2NetworkSpec),
+						// The following testcases are labeled as extended,
+						// might not be run on all jobs
+						ginkgo.Entry("Layer 3 UDN non advertised", udn, otherLayer3NetworkSpec, label.Extended()),
+						ginkgo.Entry("Layer 3 CUDN advertised", cudnAdvertised, otherLayer3NetworkSpec, label.Extended()),
+						ginkgo.Entry("Layer 2 UDN non advertised", udn, otherLayer2NetworkSpec, label.Extended()),
+						ginkgo.Entry("Layer 2 CUDN advertised", cudnAdvertised, otherLayer2NetworkSpec, label.Extended()),
 					}
 
 					ginkgo.DescribeTableSubtree("Of type",

test/scripts/e2e-cp.sh

@@ -40,6 +40,14 @@ skip() {
   SKIPPED_TESTS+=$*
 }
 
+SKIPPED_LABELED_TESTS=""
+skip_label() {
+  if [ "$SKIPPED_LABELED_TESTS" != "" ]; then
+  	SKIPPED_LABELED_TESTS+=" && "
+  fi
+  SKIPPED_LABELED_TESTS+="!($*)"
+}
+
 if [ "$PLATFORM_IPV4_SUPPORT" == true ]; then
   if  [ "$PLATFORM_IPV6_SUPPORT" == true ]; then
 	  # No support for these features in dual-stack yet
@@ -138,6 +146,11 @@ if [ "$ENABLE_ROUTE_ADVERTISEMENTS" != true ]; then
   skip $BGP_TESTS
 else
   if [ "$ADVERTISE_DEFAULT_NETWORK" = true ]; then
+    # Filter out extended RouteAdvertisements tests to keep job run time down
+    if [ "$ENABLE_NETWORK_SEGMENTATION" = true ]; then
+      skip_label "Feature:RouteAdvertisements && EXTENDED"
+    fi
+    
     # Some test don't work when the default network is advertised, either because
     # the configuration that the test excercises does not make sense for an advertised network, or
     # there is some bug or functional gap
@@ -203,6 +216,7 @@ go test -test.timeout ${GO_TEST_TIMEOUT}m -v . \
         -ginkgo.timeout ${TEST_TIMEOUT}m \
         -ginkgo.flake-attempts ${FLAKE_ATTEMPTS:-2} \
         -ginkgo.skip="${SKIPPED_TESTS}" \
+        ${SKIPPED_LABELED_TESTS:+-ginkgo.label-filter="${SKIPPED_LABELED_TESTS}"} \
         -ginkgo.junit-report=${E2E_REPORT_DIR}/junit_${E2E_REPORT_PREFIX}report.xml \
         -provider skeleton \
         -kubeconfig ${KUBECONFIG} \