[release-v1.16] Enable new test for SASL keda (#1821)

* Enable new test for SASL keda (knative-extensions#4388)

Signed-off-by: Matthias Wessendorf <[email protected]>

* Remove extra/double broker install

Signed-off-by: Matthias Wessendorf <[email protected]>

---------

Signed-off-by: Matthias Wessendorf <[email protected]>

Author: matzew

test/e2e_new/broker_test.go

@@ -358,3 +358,33 @@ func TestBrokerDispatcherKedaScaling(t *testing.T) {
 
 	env.Test(ctx, t, features.TriggerScalesToZeroWithKeda())
 }
+
+func TestBrokerDispatcherKedaScalingSASL(t *testing.T) {
+	t.Parallel()
+
+	ctx, env := global.Environment(
+		knative.WithKnativeNamespace(system.Namespace()),
+		knative.WithLoggingConfig,
+		knative.WithTracingConfig,
+		k8s.WithEventListener,
+		environment.WithPollTimings(5*time.Second, 4*time.Minute),
+		environment.Managed(t),
+	)
+
+	env.Test(ctx, t, features.TriggerSASLScalesToZeroWithKeda())
+}
+
+func TestBrokerDispatcherKedaScalingSSL(t *testing.T) {
+	t.Parallel()
+
+	ctx, env := global.Environment(
+		knative.WithKnativeNamespace(system.Namespace()),
+		knative.WithLoggingConfig,
+		knative.WithTracingConfig,
+		k8s.WithEventListener,
+		environment.WithPollTimings(5*time.Second, 4*time.Minute),
+		environment.Managed(t),
+	)
+
+	env.Test(ctx, t, features.TriggerSSLScalesToZeroWithKeda())
+}

test/e2e_new/kafka_source_test.go

@@ -242,6 +242,22 @@ func TestKafkaSourceKedaScaling(t *testing.T) {
 
 }
 
+func TestKafkaSourceKedaScalingSASL(t *testing.T) {
+	t.Parallel()
+
+	ctx, env := global.Environment(
+		knative.WithKnativeNamespace(system.Namespace()),
+		knative.WithLoggingConfig,
+		knative.WithTracingConfig,
+		k8s.WithEventListener,
+		environment.WithPollTimings(5*time.Second, 4*time.Minute),
+		environment.Managed(t),
+	)
+
+	env.Test(ctx, t, features.KafkaSourceSASLScalesToZeroWithKeda())
+
+}
+
 func TestKafkaSourceScaledObject(t *testing.T) {
 	t.Parallel()
 

test/rekt/features/keda_scaling.go

@@ -244,7 +244,6 @@ func TriggerSASLScalesToZeroWithKeda() *feature.Feature {
 	))
 
 	f.Setup("install sink", eventshub.Install(sinkName, eventshub.StartReceiver))
-	f.Setup("install broker", broker.Install(brokerName))
 	f.Setup("install trigger", trigger.Install(triggerName, trigger.WithBrokerName(brokerName), trigger.WithSubscriber(service.AsKReference(sinkName), "")))
 
 	f.Requirement("install source", eventshub.Install(sourceName, eventshub.StartSenderToResource(broker.GVR(), brokerName), eventshub.InputEvent(event)))
@@ -290,7 +289,6 @@ func TriggerSSLScalesToZeroWithKeda() *feature.Feature {
 	))
 
 	f.Setup("install sink", eventshub.Install(sinkName, eventshub.StartReceiver))
-	f.Setup("install broker", broker.Install(brokerName))
 	f.Setup("install trigger", trigger.Install(triggerName, trigger.WithBrokerName(brokerName), trigger.WithSubscriber(service.AsKReference(sinkName), "")))
 
 	f.Requirement("install source", eventshub.Install(sourceName, eventshub.StartSenderToResource(broker.GVR(), brokerName), eventshub.InputEvent(event)))