Remove FeatureGate check in e2e tests

Author: jhadvig

test-e2e.sh

@@ -11,9 +11,6 @@ echo "Running tests..."
 if [ "$OPENSHIFT_CI" = true ]; then
     KUBERNETES_CONFIG=${KUBECONFIG} go test -timeout 30m -v ./test/e2e/ 2>&1 | tee "$ARTIFACT_DIR/test.out"
     RESULT="${PIPESTATUS[0]}"
-    # This is a hack for add prefix to the TestPluginsCSP* test names, so sippy can read them.
-    # Remove once the Featuregate is lifted.
-    sed -i 's/TestPluginsCSP/[OCPFeatureGate:ConsolePluginContentSecurityPolicy]&/g' "$ARTIFACT_DIR/test.out"
 
     go-junit-report < "$ARTIFACT_DIR/test.out" > "$ARTIFACT_DIR/junit.xml"
     if [ "$RESULT" -ne 0 ]; then

test/e2e/plugins_test.go

@@ -133,11 +133,6 @@ func cleanupTestCase(t *testing.T, client *framework.ClientSet, defaultPlugins,
 func TestPluginsCSPSinglePlugin(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPSinglePlugin))
 
 	for name, csp := range pluginCSPSinglePlugin {
@@ -150,11 +145,6 @@ func TestPluginsCSPSinglePlugin(t *testing.T) {
 func TestPluginsCSPMultiplePluginsWithoutCSP(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePluginsWithoutCSP))
 
 	for name, csp := range pluginCSPMultiplePluginsWithoutCSP {
@@ -167,11 +157,6 @@ func TestPluginsCSPMultiplePluginsWithoutCSP(t *testing.T) {
 func TestPluginsCSPMultiplePlugins(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePlugins))
 
 	for name, csp := range pluginCSPMultiplePlugins {
@@ -184,11 +169,6 @@ func TestPluginsCSPMultiplePlugins(t *testing.T) {
 func TestPluginsCSPMultiplePluginsWithDuplicates(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePluginsWithDuplicates))
 
 	for name, csp := range pluginCSPMultiplePluginsWithDuplicates {
@@ -200,11 +180,6 @@ func TestPluginsCSPMultiplePluginsWithDuplicates(t *testing.T) {
 func TestPluginsCSPMultiplePluginsWithMutualExclusion(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePluginsWithMutualExclusion))
 
 	for name, csp := range pluginCSPMultiplePluginsWithMutualExclusion {