diff --git a/test/e2e-common.sh b/test/e2e-common.sh index ca4765cdfeb..7a007291e86 100755 --- a/test/e2e-common.sh +++ b/test/e2e-common.sh @@ -82,6 +82,12 @@ UNINSTALL_LIST=() # Setup the Knative environment for running tests. function knative_setup() { install_knative_eventing + + install_mt_broker || fail_test "Could not install MT Channel Based Broker" + + install_sugar || fail_test "Could not install Sugar Controller" + + unleash_duck || fail_test "Could not unleash the chaos duck" } function scale_controlplane() { diff --git a/test/e2e-conformance-tests.sh b/test/e2e-conformance-tests.sh new file mode 100755 index 00000000000..74a4282f32b --- /dev/null +++ b/test/e2e-conformance-tests.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +# Copyright 2020 The Knative Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This script runs the end-to-end tests against eventing built from source. + +# If you already have the *_OVERRIDE environment variables set, call +# this script with the --run-tests arguments and it will use the cluster +# and run the tests. + +# Calling this script without arguments will create a new cluster in +# project $PROJECT_ID, start Knative eventing system, run the tests and +# delete the cluster. + +export GO111MODULE=on + +source "$(dirname "$0")/e2e-common.sh" + +# Script entry point. + +initialize $@ --skip-istio-addon + +echo "Running tests with Multi Tenant Channel Based Broker" +go_test_e2e -timeout=30m -parallel=12 ./test/conformance -brokerclass=MTChannelBasedBroker -channels=messaging.knative.dev/v1beta1:Channel,messaging.knative.dev/v1beta1:InMemoryChannel,messaging.knative.dev/v1:Channel,messaging.knative.dev/v1:InMemoryChannel -sources=sources.knative.dev/v1alpha2:ApiServerSource,sources.knative.dev/v1alpha2:ContainerSource,sources.knative.dev/v1alpha2:PingSource || fail_test + +success diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index 80eeabd222e..32e2fb88cbe 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -32,13 +32,7 @@ source "$(dirname "$0")/e2e-common.sh" initialize $@ --skip-istio-addon -install_mt_broker || fail_test "Could not install MT Channel Based Broker" - -install_sugar || fail_test "Could not install Sugar Controller" - -unleash_duck || fail_test "Could not unleash the chaos duck" - echo "Running tests with Multi Tenant Channel Based Broker" -go_test_e2e -timeout=30m -parallel=12 ./test/e2e ./test/conformance -brokerclass=MTChannelBasedBroker -channels=messaging.knative.dev/v1beta1:Channel,messaging.knative.dev/v1beta1:InMemoryChannel,messaging.knative.dev/v1:Channel,messaging.knative.dev/v1:InMemoryChannel -sources=sources.knative.dev/v1beta1:ApiServerSource,sources.knative.dev/v1alpha2:ContainerSource,sources.knative.dev/v1alpha2:PingSource || fail_test +go_test_e2e -timeout=30m -parallel=12 ./test/e2e -brokerclass=MTChannelBasedBroker -channels=messaging.knative.dev/v1beta1:Channel,messaging.knative.dev/v1beta1:InMemoryChannel,messaging.knative.dev/v1:Channel,messaging.knative.dev/v1:InMemoryChannel -sources=sources.knative.dev/v1alpha2:ApiServerSource,sources.knative.dev/v1alpha2:ContainerSource,sources.knative.dev/v1alpha2:PingSource || fail_test success