Create paired upgrade tests (#8158)

* Re-use channel.ChannelChain reconciler-test feature in upgrade tests

* Fix glob -> global

* Remove redundant feature name from test name

* Remove Setup/Verify from test name

* Use slices.Concat from Golang 1.22

* Include setupEnv and setupCtx in DurableFeature

* Remove most pointers

* Refactor and use FeatureGroupWithUpgradeTests

* Try workaround for issues/8161

* Renames

* Expose EnvOpts and make DurableFeature more configurable

test/e2e-common.sh

@@ -187,6 +187,9 @@ function install_knative_eventing() {
     UNINSTALL_LIST+=( "${EVENTING_RELEASE_YAML}" )
   fi
 
+  # Workaround for https://github.com/knative/eventing/issues/8161
+  kubectl label namespace "${SYSTEM_NAMESPACE}" bindings.knative.dev/exclude=true --overwrite
+
   # Setup config tracing for tracing tests
   local TMP_CONFIG_TRACING_CONFIG=${TMP_DIR}/${CONFIG_TRACING_CONFIG##*/}
   sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" "${CONFIG_TRACING_CONFIG}" > "${TMP_CONFIG_TRACING_CONFIG}"

test/rekt/features/channel/features.go

@@ -47,8 +47,16 @@ import (
 
 func ChannelChain(length int, createSubscriberFn func(ref *duckv1.KReference, uri string) manifest.CfgFn) *feature.Feature {
 	f := feature.NewFeature()
-	sink := feature.MakeRandomK8sName("sink")
-	cs := feature.MakeRandomK8sName("containersource")
+
+	sink, channel := ChannelChainSetup(f, length, createSubscriberFn)
+
+	ChannelChainAssert(f, sink, channel)
+
+	return f
+}
+
+func ChannelChainSetup(f *feature.Feature, length int, createSubscriberFn func(ref *duckv1.KReference, uri string) manifest.CfgFn) (sink string, channel string) {
+	sink = feature.MakeRandomK8sName("sink")
 
 	var channels []string
 	for i := 0; i < length; i++ {
@@ -79,13 +87,19 @@ func ChannelChain(length int, createSubscriberFn func(ref *duckv1.KReference, ur
 		f.Setup("subscription is ready", subscription.IsReady(sub))
 	}
 
-	// attach the first channel to the source
-	f.Requirement("install containersource", containersource.Install(cs, containersource.WithSink(channel_impl.AsDestinationRef(channels[0]))))
-	f.Requirement("containersource goes ready", containersource.IsReady(cs))
+	return sink, channels[0]
+}
 
-	f.Assert("chained channels relay events", assert.OnStore(sink).MatchEvent(test.HasType("dev.knative.eventing.samples.heartbeat")).AtLeast(1))
+func ChannelChainAssert(f *feature.Feature, sink, channel string) {
+	cs := feature.MakeRandomK8sName("containersource")
+	eventType := feature.MakeRandomK8sName("et")
+	args := "--eventType=" + eventType
+	f.Requirement("install containersource", containersource.Install(cs,
+		containersource.WithSink(channel_impl.AsDestinationRef(channel)),
+		containersource.WithArgs(args)))
+	f.Requirement("containersource goes ready", containersource.IsReady(cs))
 
-	return f
+	f.Assert("chained channels relay events", assert.OnStore(sink).MatchEvent(test.HasType(eventType)).AtLeast(1))
 }
 
 func DeadLetterSink(createSubscriberFn func(ref *duckv1.KReference, uri string) manifest.CfgFn) *feature.Feature {

test/upgrade/postupgrade.go

@@ -22,24 +22,10 @@ import (
 	pkgupgrade "knative.dev/pkg/test/upgrade"
 )
 
-func SmokePostUpgradeTest() pkgupgrade.Operation {
-	return pkgupgrade.NewOperation("EventingPostUpgradeTest", func(c pkgupgrade.Context) {
-		runSmokeTest(c.T)
-	})
-}
-
 func CRDPostUpgradeTest() pkgupgrade.Operation {
 	return pkgupgrade.NewOperation("PostUpgradeCRDTest", func(c pkgupgrade.Context) {
 		client := testlib.Setup(c.T, true)
 		defer testlib.TearDown(client)
 		migrate.ExpectSingleStoredVersion(c.T, client.Apiextensions.CustomResourceDefinitions(), "knative.dev")
 	})
 }
-
-// PostUpgradeTests is an umbrella function for grouping all Eventing post-upgrade tests.
-func PostUpgradeTests() []pkgupgrade.Operation {
-	return []pkgupgrade.Operation{
-		SmokePostUpgradeTest(),
-		CRDPostUpgradeTest(),
-	}
-}