From 130c86e274ee35810cd6aef54f0ddf67a32121df Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Fri, 15 May 2020 09:28:52 +0200 Subject: [PATCH] Reflecting new configs and stuff Signed-off-by: Matthias Wessendorf --- openshift/e2e-tests-openshift.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openshift/e2e-tests-openshift.sh b/openshift/e2e-tests-openshift.sh index 8cd1ae1a799..d7a5ff0b1a6 100644 --- a/openshift/e2e-tests-openshift.sh +++ b/openshift/e2e-tests-openshift.sh @@ -143,14 +143,16 @@ function install_knative_eventing(){ } function run_e2e_tests(){ - header "Running tests with Channel Based Broker" + header "Running tests with Single Tenant Channel Based Broker" + oc apply -f test/config/st-channel-broker.yaml || return 1 + wait_until_pods_running $EVENTING_NAMESPACE || return 1 go_test_e2e -timeout=90m -parallel=12 ./test/e2e -brokerclass=ChannelBasedBroker -channels=messaging.knative.dev/v1alpha1:InMemoryChannel,messaging.knative.dev/v1alpha1:Channel,messaging.knative.dev/v1beta1:InMemoryChannel \ --kubeconfig "$KUBECONFIG" \ --dockerrepo "quay.io/openshift-knative" \ ${options} || failed=1 - header "Running tests with Multi TenantChannel Based Broker" - oc apply -f test/config/mt-channel-broker.yaml || return 1 + header "Running tests with Multi Tenant Channel Based Broker" + oc apply -f config/core/configmaps/default-broker.yaml || return 1 oc -n knative-eventing set env deployment/mt-broker-controller BROKER_INJECTION_DEFAULT=true || return 1 wait_until_pods_running $EVENTING_NAMESPACE || return 1