[1.15] Including eventing-kafka upgrade tests for source and channel

go.mod

@@ -42,7 +42,7 @@ replace (
 	k8s.io/client-go => k8s.io/client-go v0.19.7
 	k8s.io/code-generator => k8s.io/code-generator v0.19.7
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
-	knative.dev/eventing => github.com/openshift/knative-eventing v0.99.1-0.20210406161751-80f49379d45d
-	knative.dev/eventing-kafka => github.com/openshift-knative/eventing-kafka v0.19.1-0.20210420075609-dbcba4bee3ce
+	knative.dev/eventing => github.com/openshift/knative-eventing v0.99.1-0.20210531143233-6e76ef9f2ce0
+	knative.dev/eventing-kafka => github.com/openshift-knative/eventing-kafka v0.21.1-0.20210526142120-91eb12066b84
 	knative.dev/serving => github.com/openshift/knative-serving v0.10.1-0.20210420084308-e1193e08522a
 )

test/eventing.bash

@@ -3,9 +3,6 @@
 # For SC2164
 set -e
 
-readonly EVENTING_READY_FILE="/tmp/eventing-prober-ready"
-readonly EVENTING_PROBER_FILE="/tmp/eventing-prober-signal"
-
 function upstream_knative_eventing_e2e {
   logger.info 'Running eventing tests'
 

test/lib.bash

@@ -198,12 +198,10 @@ function run_rolling_upgrade_tests {
   channels=messaging.knative.dev/v1beta1:KafkaChannel,messaging.knative.dev/v1:InMemoryChannel
 
   # Test configuration. See https://github.com/knative/eventing/tree/main/test/upgrade#probe-test-configuration
-  # TODO(ksuszyns): remove E2E_UPGRADE_TESTS_SERVING_SCALETOZERO when knative/operator#297 is fixed.
-  E2E_UPGRADE_TESTS_SERVING_SCALETOZERO=false \
-  E2E_UPGRADE_TESTS_SERVING_USE=true \
-  E2E_UPGRADE_TESTS_CONFIGMOUNTPOINT=/.config/wathola \
-  E2E_UPGRADE_TESTS_INTERVAL="50ms" \
-  E2E_UPGRADE_TESTS_FAILONERRORS=true \
+  # TODO(ksuszyns): remove EVENTING_UPGRADE_TESTS_SERVING_SCALETOZERO when knative/operator#297 is fixed.
+  EVENTING_UPGRADE_TESTS_SERVING_SCALETOZERO=false \
+  EVENTING_UPGRADE_TESTS_SERVING_USE=true \
+  EVENTING_UPGRADE_TESTS_CONFIGMOUNTPOINT=/.config/wathola \
   GO_TEST_VERBOSITY=standard-verbose \
   SYSTEM_NAMESPACE=knative-serving \
   go_test_e2e -tags=upgrade -timeout=30m \

test/upgrade/continual/channel-config.toml

@@ -0,0 +1 @@
+../../../vendor/knative.dev/eventing-kafka/test/upgrade/continual/channel-config.toml

test/upgrade/continual/source-config.toml

@@ -0,0 +1 @@
+../../../vendor/knative.dev/eventing-kafka/test/upgrade/continual/source-config.toml

test/upgrade/upgrade_test.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/openshift-knative/serverless-operator/test"
 	"github.com/openshift-knative/serverless-operator/test/upgrade/installation"
+	"knative.dev/eventing-kafka/test/upgrade/continual"
 
 	"go.uber.org/zap"
 	kafkaupgrade "knative.dev/eventing-kafka/test/upgrade"
@@ -32,7 +33,8 @@ import (
 	servingupgrade "knative.dev/serving/test/upgrade"
 )
 
-// FIXME: https://github.com/knative/eventing/issues/5176 `config.toml` in this directory is required
+// FIXME: https://github.com/knative/eventing/issues/5176 `*-config.toml` in
+//        this directory are required, so that kafkaupgrade tests will see them.
 
 func TestServerlessUpgrade(t *testing.T) {
 	ctx := test.SetupClusterAdmin(t)
@@ -42,14 +44,16 @@ func TestServerlessUpgrade(t *testing.T) {
 		Tests: pkgupgrade.Tests{
 			PreUpgrade:  preUpgradeTests(),
 			PostUpgrade: postUpgradeTests(ctx),
-			Continual: []pkgupgrade.BackgroundOperation{
-				servingupgrade.ProbeTest(),
-				servingupgrade.AutoscaleSustainingWithTBCTest(),
-				servingupgrade.AutoscaleSustainingTest(),
-				eventingupgrade.ContinualTest(),
-				kafkaupgrade.ChannelContinualTest(),
-				kafkaupgrade.SourceContinualTest(),
-			},
+			Continual: merge(
+				[]pkgupgrade.BackgroundOperation{
+					servingupgrade.ProbeTest(),
+					servingupgrade.AutoscaleSustainingWithTBCTest(),
+					servingupgrade.AutoscaleSustainingTest(),
+					eventingupgrade.ContinualTest(),
+				},
+				kafkaupgrade.ChannelContinualTests(continual.ChannelTestOptions{}),
+				kafkaupgrade.SourceContinualTests(continual.SourceTestOptions{}),
+			),
 		},
 		Installations: pkgupgrade.Installations{
 			UpgradeWith: []pkgupgrade.Operation{
@@ -89,6 +93,18 @@ func TestClusterUpgrade(t *testing.T) {
 	suite.Execute(cfg)
 }
 
+func merge(slices ...[]pkgupgrade.BackgroundOperation) []pkgupgrade.BackgroundOperation {
+	l := 0
+	for _, slice := range slices {
+		l += len(slice)
+	}
+	result := make([]pkgupgrade.BackgroundOperation, 0, l)
+	for _, slice := range slices {
+		result = append(result, slice...)
+	}
+	return result
+}
+
 func preUpgradeTests() []pkgupgrade.Operation {
 	tests := []pkgupgrade.Operation{
 		eventingupgrade.PreUpgradeTest(),