Moved new trigger filters tests to rekt from experimental

config/core/configmaps/features.yaml

@@ -39,10 +39,10 @@ data:
   # For more details: https://github.com/knative/eventing/issues/5593
   kreference-mapping: "disabled"
 
-  # ALPHA feature: The new-trigger-filters flag allows you to use the new `filters` field
+  # BETA feature: The new-trigger-filters flag allows you to use the new `filters` field
   # in Trigger objects with its rich filtering capabilities.
   # For more details: https://github.com/knative/eventing/issues/5204
-  new-trigger-filters: "disabled"
+  new-trigger-filters: "enabled"
 
   # ALPHA feature: The transport-encryption flag allows you to encrypt events in transit using the transport layer security (TLS) protocol.
   # For more details: https://github.com/knative/eventing/issues/5957

test/experimental/eventtype_autocreate_test.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"knative.dev/eventing/test/experimental/features/eventtype_autocreate"
+	"knative.dev/eventing/test/rekt/resources/broker"
 
 	"knative.dev/pkg/system"
 	"knative.dev/reconciler-test/pkg/environment"
@@ -54,7 +55,7 @@ func TestBrokerEventTypeAutoCreate(t *testing.T) {
 	)
 	brokerName := feature.MakeRandomK8sName("broker")
 
-	env.Prerequisite(ctx, t, InstallMTBroker(brokerName))
+	env.Prerequisite(ctx, t, broker.InstallMTBroker(brokerName))
 	env.Test(ctx, t, eventtype_autocreate.AutoCreateEventTypesOnBroker(brokerName))
 }
 

test/experimental/new_trigger_filters_test.go → test/rekt/new_trigger_filters_test.go

@@ -17,19 +17,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package experimental
+package rekt
 
 import (
-	"fmt"
 	"testing"
 
+	newfilters "knative.dev/eventing/test/rekt/features/new_trigger_filters"
+
 	"knative.dev/pkg/system"
 	"knative.dev/reconciler-test/pkg/environment"
-	"knative.dev/reconciler-test/pkg/feature"
 	"knative.dev/reconciler-test/pkg/k8s"
 	"knative.dev/reconciler-test/pkg/knative"
 
-	newfilters "knative.dev/eventing/test/experimental/features/new_trigger_filters"
 	"knative.dev/eventing/test/rekt/resources/broker"
 )
 
@@ -45,7 +44,7 @@ func TestMTChannelBrokerNewTriggerFilters(t *testing.T) {
 	)
 	brokerName := "default"
 
-	env.Prerequisite(ctx, t, InstallMTBroker(brokerName))
+	env.Prerequisite(ctx, t, broker.InstallMTBroker(brokerName))
 	env.TestSet(ctx, t, newfilters.FiltersFeatureSet(brokerName))
 }
 
@@ -61,7 +60,7 @@ func TestMTChannelBrokerAnyTriggerFilters(t *testing.T) {
 	)
 	brokerName := "default"
 
-	env.Prerequisite(ctx, t, InstallMTBroker(brokerName))
+	env.Prerequisite(ctx, t, broker.InstallMTBroker(brokerName))
 	env.Test(ctx, t, newfilters.AnyFilterFeature(brokerName))
 }
 
@@ -77,13 +76,6 @@ func TestMTChannelBrokerAllTriggerFilters(t *testing.T) {
 	)
 	brokerName := "default"
 
-	env.Prerequisite(ctx, t, InstallMTBroker(brokerName))
+	env.Prerequisite(ctx, t, broker.InstallMTBroker(brokerName))
 	env.Test(ctx, t, newfilters.AllFilterFeature(brokerName))
 }
-
-func InstallMTBroker(name string) *feature.Feature {
-	f := feature.NewFeatureNamed("Multi-tenant channel-based broker")
-	f.Setup(fmt.Sprintf("Install broker %q", name), broker.Install(name, broker.WithEnvConfig()...))
-	f.Requirement("Broker is ready", broker.IsReady(name))
-	return f
-}

test/rekt/resources/broker/broker.go

@@ -19,6 +19,7 @@ package broker
 import (
 	"context"
 	"embed"
+	"fmt"
 	"log"
 	"os"
 	"time"
@@ -279,3 +280,10 @@ func AsKReference(name string) *duckv1.KReference {
 		APIVersion: "eventing.knative.dev/v1",
 	}
 }
+
+func InstallMTBroker(name string) *feature.Feature {
+	f := feature.NewFeatureNamed("Multi-tenant channel-based broker")
+	f.Setup(fmt.Sprintf("Install broker %q", name), Install(name, WithEnvConfig()...))
+	f.Requirement("Broker is ready", IsReady(name))
+	return f
+}