From 55eecc8fc98ea740d20efc71ed2032ab77d890d1 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Thu, 20 Aug 2020 14:54:18 -0700 Subject: [PATCH 1/5] cp 3897 --- pkg/mtbroker/filter/filter_handler.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/mtbroker/filter/filter_handler.go b/pkg/mtbroker/filter/filter_handler.go index 80b49f7b5da..70252c76710 100644 --- a/pkg/mtbroker/filter/filter_handler.go +++ b/pkg/mtbroker/filter/filter_handler.go @@ -255,8 +255,12 @@ func (h *Handler) sendEvent(ctx context.Context, headers http.Header, target str err = fmt.Errorf("failed to dispatch message: %w", err) } - _ = h.reporter.ReportEventDispatchTime(reporterArgs, resp.StatusCode, dispatchTime) + sc := 0 + if resp != nil { + sc = resp.StatusCode + } + _ = h.reporter.ReportEventDispatchTime(reporterArgs, sc, dispatchTime) return resp, err } From 5ed5d69b6f8780963280a13986aefa73a9ab63bf Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Fri, 21 Aug 2020 07:36:51 -0700 Subject: [PATCH 2/5] backport 3719 --- test/e2e-conformance-tests.sh | 38 +++++++++++++++++++++++++++++++++++ test/e2e-tests.sh | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 test/e2e-conformance-tests.sh diff --git a/test/e2e-conformance-tests.sh b/test/e2e-conformance-tests.sh new file mode 100644 index 00000000000..6513999e8b8 --- /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/v1beta1: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 10797079551..4c3e993ba37 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -37,6 +37,6 @@ install_mt_broker || fail_test "Could not install MT Channel Based Broker" install_sugar || fail_test "Could not install Sugar Controller" 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/v1alpha2: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 From bbe7adc0cee228ce3535d610ac63df0d211ac4d3 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Fri, 21 Aug 2020 07:42:37 -0700 Subject: [PATCH 3/5] x bit --- test/e2e-conformance-tests.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 test/e2e-conformance-tests.sh diff --git a/test/e2e-conformance-tests.sh b/test/e2e-conformance-tests.sh old mode 100644 new mode 100755 From fa89214296b4409708f721fc880cceec3c9d2b34 Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Fri, 21 Aug 2020 10:39:03 -0700 Subject: [PATCH 4/5] apiserversource v1beta1->v1alpha2 --- test/e2e-conformance-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e-conformance-tests.sh b/test/e2e-conformance-tests.sh index 6513999e8b8..74a4282f32b 100755 --- a/test/e2e-conformance-tests.sh +++ b/test/e2e-conformance-tests.sh @@ -33,6 +33,6 @@ source "$(dirname "$0")/e2e-common.sh" 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/v1beta1:ApiServerSource,sources.knative.dev/v1alpha2:ContainerSource,sources.knative.dev/v1alpha2:PingSource || fail_test +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 From f7ea846974147c58c1bed9f1c9cdc1da0324c9bd Mon Sep 17 00:00:00 2001 From: Ville Aikas Date: Fri, 21 Aug 2020 11:18:33 -0700 Subject: [PATCH 5/5] install broker / sugar --- test/e2e-conformance-tests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/e2e-conformance-tests.sh b/test/e2e-conformance-tests.sh index 74a4282f32b..04b63db2a0a 100755 --- a/test/e2e-conformance-tests.sh +++ b/test/e2e-conformance-tests.sh @@ -32,6 +32,11 @@ 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" + 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