Merge pull request #2398 from dfajmon/featuregate

NO-JIRA: UPSTREAM: <carry>: Filter featuregates by FeatureGate label instead of using OffByDefault label

Author: openshift-merge-bot[bot]

openshift-hack/cmd/k8s-tests-ext/disabled_tests.go

@@ -11,16 +11,12 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
 		"Alpha": { // alpha features that are not gated
 			"[Feature:StorageVersionAPI]",
 			"[Feature:ClusterTrustBundle]",
-			"[Feature:SELinuxMount]",
-			"[FeatureGate:SELinuxMount]",
 			"[Feature:DynamicResourceAllocation]",
-			"[Feature:VolumeAttributesClass]", // disabled Beta
 			"[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27
 			// 4.19
 			"[Feature:PodLevelResources]",
 			"[Feature:PodLogsQuerySplitStreams]",
 			// 4.20
-			"[Feature:OffByDefault]",
 			"[Feature:CBOR]",
 		},
 		// tests for features that are not implemented in openshift

openshift-hack/cmd/k8s-tests-ext/environment_selectors.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"strings"
 
 	et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
 	"k8s.io/kubernetes/pkg/features"
@@ -15,6 +16,7 @@ func addEnvironmentSelectors(specs et.ExtensionTestSpecs) {
 	filterByTopology(specs)
 	filterByNoOptionalCapabilities(specs)
 	filterByNetwork(specs)
+	filterByFeatureGates(specs)
 
 	// LoadBalancer tests in 1.31 require explicit platform-specific skips
 	// https://issues.redhat.com/browse/OCPBUGS-38840
@@ -273,3 +275,15 @@ func filterByNetwork(specs et.ExtensionTestSpecs) {
 			AddLabel(fmt.Sprintf("[Skipped:%s]", network))
 	}
 }
+
+// filter all tests from feature gates that are not explicitly enabled
+func filterByFeatureGates(specs et.ExtensionTestSpecs) {
+	for _, spec := range specs {
+		for label := range spec.Labels {
+			if strings.Contains(label, "FeatureGate:") {
+				featureGate := strings.TrimPrefix(label, "FeatureGate:")
+				spec.Exclude(et.FeatureGateDisabled(featureGate))
+			}
+		}
+	}
+}

openshift-hack/test-kubernetes-e2e.sh

@@ -31,7 +31,7 @@ NETWORK_SKIPS="\[Skipped:Network/OVNKubernetes\]|\[Feature:Networking-IPv6\]|\[F
 TEST_SUITE="${TEST_SUITE:-parallel}"
 COMMON_SKIPS="\[Slow\]|\[Disruptive\]|\[Flaky\]|\[Disabled:.+\]|\[Skipped:${PLATFORM}\]|${NETWORK_SKIPS}"
 # Skip tests for features that require a TechPreview cluster. TODO: Remove when the feature is enabled by default.
-COMMON_SKIPS="\[OCPFeatureGate:VolumeGroupSnapshot\]|${COMMON_SKIPS}"
+COMMON_SKIPS="\[OCPFeatureGate:VolumeGroupSnapshot\]|\[Feature:OffByDefault\]|${COMMON_SKIPS}"
 
 case "${TEST_SUITE}" in
 serial)