kitchensink-upgrade, skip features only available in newer versions

olm-catalog/serverless-operator-index/Dockerfile

@@ -16,7 +16,7 @@ COPY olm-catalog/serverless-operator-index/index-bundles.yaml /index-bundles.yam
 RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> /configs/index.yaml
 RUN cat /index-bundles.yaml >> /configs/index.yaml
 RUN /bin/opm render --skip-tls-verify -o yaml \
-      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/serverless-bundle@sha256:4259c65eebfbe03585639d73c3239f443c4dc16c598663f47d1ed544aa5eefef >> /configs/index.yaml
+      quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/serverless-bundle@sha256:b1657a3acdec74007b0d6693ea7d52fa9cd4662a77dc3beaa31984361b00bca8 >> /configs/index.yaml
 
 # The base image is expected to contain
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe

olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml

@@ -72,13 +72,13 @@ metadata:
     capabilities: Full Lifecycle
     categories: Networking,Integration & Delivery,Cloud Provider,Developer Tools
     certified: "false"
-    createdAt: "2026-06-12T11:53:39Z"
+    createdAt: "2026-07-14T14:33:00Z"
     description: |-
       Deploy and manage event-driven serverless applications and functions using Knative.
     repository: https://github.com/openshift-knative/serverless-operator
     support: Red Hat
     olm.skipRange: '>1.37.1 <1.38.0'
-    operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:a9f5c07d761909208a98abc3511e6ce7457a705d26f413222b068a2254b1d88e
+    operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:db1ae782b76cefd4669973e01b44e77f5212fd0a900b17c35e43c8732d5d9779
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.ppc64le: supported
@@ -838,7 +838,7 @@ spec:
                 serviceAccountName: knative-operator
                 containers:
                   - name: knative-operator
-                    image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:0a61bc1a63e078b602e28ec9570caf208e819ea24b19a995465a14ea84414299
+                    image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:2da67018c0976a246e4776f78cbbe89f0bb66a6a90980e4d60ed4ae6c8d649d3
                     readinessProbe:
                       periodSeconds: 1
                       httpGet:
@@ -1023,7 +1023,7 @@ spec:
                           - ALL
                 containers:
                   - name: knative-openshift
-                    image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:f078ea8b88d16be6ad6c8e322ae6b42e320cc5d4172d66d591f1122dcf98adb0
+                    image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:9c5750656a98ca95b5fa5ecbf53f6bc6b22dd13d555140b7aecf032eb327c036
                     imagePullPolicy: Always
                     readinessProbe:
                       httpGet:
@@ -1225,7 +1225,7 @@ spec:
                 serviceAccountName: knative-openshift-ingress
                 containers:
                   - name: knative-openshift-ingress
-                    image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:08bdcefc7dac163b7c2d943ed3253eae6001daac7059a580126e4af6d63b169e
+                    image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:dbabd8a985d2866e4d17135da3fdbdf92e91fa69a9ca523bedf124f572ebc3b4
                     imagePullPolicy: Always
                     ports:
                       - containerPort: 9090
@@ -1376,11 +1376,11 @@ spec:
         - knativeeventings.operator.knative.dev
   relatedImages:
     - name: "knative-operator"
-      image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:0a61bc1a63e078b602e28ec9570caf208e819ea24b19a995465a14ea84414299"
+      image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel9-operator@sha256:2da67018c0976a246e4776f78cbbe89f0bb66a6a90980e4d60ed4ae6c8d649d3"
     - name: "knative-openshift"
-      image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:f078ea8b88d16be6ad6c8e322ae6b42e320cc5d4172d66d591f1122dcf98adb0"
+      image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel9@sha256:9c5750656a98ca95b5fa5ecbf53f6bc6b22dd13d555140b7aecf032eb327c036"
     - name: "knative-openshift-ingress"
-      image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:08bdcefc7dac163b7c2d943ed3253eae6001daac7059a580126e4af6d63b169e"
+      image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel9@sha256:dbabd8a985d2866e4d17135da3fdbdf92e91fa69a9ca523bedf124f572ebc3b4"
     - name: "IMAGE_queue-proxy"
       image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel9@sha256:d6aa8e4bb1bef2e41f19804af2c54ad2da9df274f1be5238101ebcf71e698373"
     - name: "IMAGE_activator"
@@ -1490,7 +1490,7 @@ spec:
     - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate"
       image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel9@sha256:f067b7c14f89197d392334c95463130e1fa2cdf2c7a9c45d0344f7c166a90b0a"
     - name: "IMAGE_MUST_GATHER"
-      image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:a9f5c07d761909208a98abc3511e6ce7457a705d26f413222b068a2254b1d88e"
+      image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel9@sha256:db1ae782b76cefd4669973e01b44e77f5212fd0a900b17c35e43c8732d5d9779"
     - name: "IMAGE_KN_CLIENT_CLI_ARTIFACTS"
       image: "registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel9@sha256:82a3b18a4510978e23727266a122dada384abc5bf7eaebd606676941693bf140"
   replaces: serverless-operator.v1.37.1

rpms.lock.yaml

@@ -11,13 +11,13 @@ arches:
     name: socat
     evr: 1.7.4.1-8.el9
     sourcerpm: socat-1.7.4.1-8.el9.src.rpm
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.aarch64.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.2.aarch64.rpm
     repoid: ubi-9-for-aarch64-baseos-rpms
-    size: 420142
-    checksum: sha256:39ba71d3677854505524df265ed828c7e00f026ecfe83df6ba86c7586588cae7
+    size: 425538
+    checksum: sha256:1e1fa89a9a4b843862fb9436295f187c55d314a9eb23d4bb8d6b07b2f41ba067
     name: rsync
-    evr: 3.2.5-7.el9_8
-    sourcerpm: rsync-3.2.5-7.el9_8.src.rpm
+    evr: 3.2.5-7.el9_8.2
+    sourcerpm: rsync-3.2.5-7.el9_8.2.src.rpm
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/t/tar-1.34-11.el9.aarch64.rpm
     repoid: ubi-9-for-aarch64-baseos-rpms
     size: 904777
@@ -53,12 +53,12 @@ arches:
     checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83
     name: socat
     evr: 1.7.4.1-8.el9
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.src.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.2.src.rpm
     repoid: ubi-9-for-aarch64-baseos-source-rpms
-    size: 1317820
-    checksum: sha256:881675c5bba9391d19536569a133069ffe0dd132468a04b3ea52fb697ebf926f
+    size: 1358189
+    checksum: sha256:37d0ee99d570df9eadf8244580dc078258ae4c9833ca3458cb6dc5851a7c37ca
     name: rsync
-    evr: 3.2.5-7.el9_8
+    evr: 3.2.5-7.el9_8.2
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/source/SRPMS/Packages/t/tar-1.34-11.el9.src.rpm
     repoid: ubi-9-for-aarch64-baseos-source-rpms
     size: 2294162
@@ -93,13 +93,13 @@ arches:
     name: socat
     evr: 1.7.4.1-8.el9
     sourcerpm: socat-1.7.4.1-8.el9.src.rpm
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.ppc64le.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.2.ppc64le.rpm
     repoid: ubi-9-for-ppc64le-baseos-rpms
-    size: 453342
-    checksum: sha256:0570a89b350ada78d86d87afa90b101a7dc9791e5868b6f33fba00727440cd74
+    size: 459875
+    checksum: sha256:5e75716946f15a560fffc57967390adfdfc812d6b85997b9d712f041657cfd1f
     name: rsync
-    evr: 3.2.5-7.el9_8
-    sourcerpm: rsync-3.2.5-7.el9_8.src.rpm
+    evr: 3.2.5-7.el9_8.2
+    sourcerpm: rsync-3.2.5-7.el9_8.2.src.rpm
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/t/tar-1.34-11.el9.ppc64le.rpm
     repoid: ubi-9-for-ppc64le-baseos-rpms
     size: 945887
@@ -135,12 +135,12 @@ arches:
     checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83
     name: socat
     evr: 1.7.4.1-8.el9
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.src.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.2.src.rpm
     repoid: ubi-9-for-ppc64le-baseos-source-rpms
-    size: 1317820
-    checksum: sha256:881675c5bba9391d19536569a133069ffe0dd132468a04b3ea52fb697ebf926f
+    size: 1358189
+    checksum: sha256:37d0ee99d570df9eadf8244580dc078258ae4c9833ca3458cb6dc5851a7c37ca
     name: rsync
-    evr: 3.2.5-7.el9_8
+    evr: 3.2.5-7.el9_8.2
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/source/SRPMS/Packages/t/tar-1.34-11.el9.src.rpm
     repoid: ubi-9-for-ppc64le-baseos-source-rpms
     size: 2294162
@@ -175,13 +175,13 @@ arches:
     name: socat
     evr: 1.7.4.1-8.el9
     sourcerpm: socat-1.7.4.1-8.el9.src.rpm
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.s390x.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.2.s390x.rpm
     repoid: ubi-9-for-s390x-baseos-rpms
-    size: 422461
-    checksum: sha256:e937047c63e4f5501bc08aeada17ec184254cdc2d5cd6a1a9e39b6477bf2bb72
+    size: 427539
+    checksum: sha256:d85d04511788214c554ff3068632f9e0edb39c8e7544f0610927f79d76677182
     name: rsync
-    evr: 3.2.5-7.el9_8
-    sourcerpm: rsync-3.2.5-7.el9_8.src.rpm
+    evr: 3.2.5-7.el9_8.2
+    sourcerpm: rsync-3.2.5-7.el9_8.2.src.rpm
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/t/tar-1.34-11.el9.s390x.rpm
     repoid: ubi-9-for-s390x-baseos-rpms
     size: 907745
@@ -217,12 +217,12 @@ arches:
     checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83
     name: socat
     evr: 1.7.4.1-8.el9
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.src.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.2.src.rpm
     repoid: ubi-9-for-s390x-baseos-source-rpms
-    size: 1317820
-    checksum: sha256:881675c5bba9391d19536569a133069ffe0dd132468a04b3ea52fb697ebf926f
+    size: 1358189
+    checksum: sha256:37d0ee99d570df9eadf8244580dc078258ae4c9833ca3458cb6dc5851a7c37ca
     name: rsync
-    evr: 3.2.5-7.el9_8
+    evr: 3.2.5-7.el9_8.2
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/source/SRPMS/Packages/t/tar-1.34-11.el9.src.rpm
     repoid: ubi-9-for-s390x-baseos-source-rpms
     size: 2294162
@@ -257,13 +257,13 @@ arches:
     name: socat
     evr: 1.7.4.1-8.el9
     sourcerpm: socat-1.7.4.1-8.el9.src.rpm
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.x86_64.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/r/rsync-3.2.5-7.el9_8.2.x86_64.rpm
     repoid: ubi-9-for-x86_64-baseos-rpms
-    size: 424707
-    checksum: sha256:6c1d064c38e4a3f4bcb756cb9ea0382cccf7a262433c286db45931d114074ff3
+    size: 430699
+    checksum: sha256:73c95e6404602b407a3cced5f1ae769a2c32b5b4ce9d646fc42617941863082c
     name: rsync
-    evr: 3.2.5-7.el9_8
-    sourcerpm: rsync-3.2.5-7.el9_8.src.rpm
+    evr: 3.2.5-7.el9_8.2
+    sourcerpm: rsync-3.2.5-7.el9_8.2.src.rpm
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/t/tar-1.34-11.el9.x86_64.rpm
     repoid: ubi-9-for-x86_64-baseos-rpms
     size: 913256
@@ -299,12 +299,12 @@ arches:
     checksum: sha256:4d83732bbf754e00d15133e15673230f41fbdae4a1cc27fba1cfb84744d0bf83
     name: socat
     evr: 1.7.4.1-8.el9
-  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.src.rpm
+  - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/r/rsync-3.2.5-7.el9_8.2.src.rpm
     repoid: ubi-9-for-x86_64-baseos-source-rpms
-    size: 1317820
-    checksum: sha256:881675c5bba9391d19536569a133069ffe0dd132468a04b3ea52fb697ebf926f
+    size: 1358189
+    checksum: sha256:37d0ee99d570df9eadf8244580dc078258ae4c9833ca3458cb6dc5851a7c37ca
     name: rsync
-    evr: 3.2.5-7.el9_8
+    evr: 3.2.5-7.el9_8.2
   - url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/source/SRPMS/Packages/t/tar-1.34-11.el9.src.rpm
     repoid: ubi-9-for-x86_64-baseos-source-rpms
     size: 2294162

test/kitchensinke2e/broker_test.go

@@ -11,11 +11,11 @@ import (
 const groupSize = 8
 
 func TestBrokerReadinessBrokerDLS(t *testing.T) {
-	testFeatureSet(t, features.BrokerFeatureSetWithBrokerDLS())
+	testFeatureSet(t, features.BrokerFeatureSetWithBrokerDLS(""))
 }
 
 func TestBrokerReadinessTriggerDLS(t *testing.T) {
-	testFeatureSet(t, features.BrokerFeatureSetWithTriggerDLS())
+	testFeatureSet(t, features.BrokerFeatureSetWithTriggerDLS(""))
 }
 
 func split(featureSet feature.FeatureSet, groupSize int) []feature.FeatureSet {

test/kitchensinke2e/channel_test.go

@@ -7,5 +7,5 @@ import (
 )
 
 func TestChannelReadiness(t *testing.T) {
-	testFeatureSet(t, features.ChannelFeatureSet())
+	testFeatureSet(t, features.ChannelFeatureSet(""))
 }

test/kitchensinke2e/eventtransform_test.go

@@ -7,5 +7,5 @@ import (
 )
 
 func TestEventTransformReadiness(t *testing.T) {
-	testFeatureSet(t, features.EventTransformFeatureSet())
+	testFeatureSet(t, features.EventTransformFeatureSet(""))
 }

test/kitchensinke2e/features/broker.go

@@ -104,29 +104,32 @@ func BrokerReadiness(index int, broker component, brokerDls component, triggers
 	return f
 }
 
-func BrokerFeatureSetWithBrokerDLS() feature.FeatureSet {
-	return brokerFeatureSetWithBrokerDLS(false, 1)
+func BrokerFeatureSetWithBrokerDLS(version string) feature.FeatureSet {
+	return brokerFeatureSetWithBrokerDLS(false, 1, version)
 }
 
-func BrokerFeatureSetWithBrokerDLSShort() feature.FeatureSet {
-	return brokerFeatureSetWithBrokerDLS(true, 1)
+func BrokerFeatureSetWithBrokerDLSShort(version string) feature.FeatureSet {
+	return brokerFeatureSetWithBrokerDLS(true, 1, version)
 }
 
-func BrokerFeatureSetWithBrokerDLSStress() feature.FeatureSet {
-	return brokerFeatureSetWithBrokerDLS(true, NumDeployments)
+func BrokerFeatureSetWithBrokerDLSStress(version string) feature.FeatureSet {
+	return brokerFeatureSetWithBrokerDLS(true, NumDeployments, version)
 }
 
 // BrokerFeatureSetWithBrokerDLS returns all combinations of Broker X DeadLetterSinks,
 // each broker with all possible Triggers with the DeadLetterSink set on the Broker.
-func brokerFeatureSetWithBrokerDLS(short bool, times int) feature.FeatureSet {
+func brokerFeatureSetWithBrokerDLS(short bool, times int, version string) feature.FeatureSet {
 	dls := deadLetterSinks
 	trgs := triggers
 	if short {
 		dls = deadLetterSinksShort
 		trgs = triggersShort
 	}
-	features := make([]*feature.Feature, 0, len(brokers)*len(dls))
-	for _, broker := range brokers {
+	brks := filterByVersion(brokers, version)
+	dls = filterByVersion(dls, version)
+	trgs = filterByVersion(trgs, version)
+	features := make([]*feature.Feature, 0, len(brks)*len(dls))
+	for _, broker := range brks {
 		for _, deadLetterSink := range dls {
 			for i := 0; i < times; i++ {
 				features = append(features, BrokerReadiness(i, broker, deadLetterSink, trgs, nil))
@@ -139,29 +142,32 @@ func brokerFeatureSetWithBrokerDLS(short bool, times int) feature.FeatureSet {
 	}
 }
 
-func BrokerFeatureSetWithTriggerDLS() feature.FeatureSet {
-	return brokerFeatureSetWithTriggerDLS(false, 1)
+func BrokerFeatureSetWithTriggerDLS(version string) feature.FeatureSet {
+	return brokerFeatureSetWithTriggerDLS(false, 1, version)
 }
 
-func BrokerFeatureSetWithTriggerDLSShort() feature.FeatureSet {
-	return brokerFeatureSetWithTriggerDLS(true, 1)
+func BrokerFeatureSetWithTriggerDLSShort(version string) feature.FeatureSet {
+	return brokerFeatureSetWithTriggerDLS(true, 1, version)
 }
 
-func BrokerFeatureSetWithTriggerDLSStress() feature.FeatureSet {
-	return brokerFeatureSetWithTriggerDLS(true, NumDeployments)
+func BrokerFeatureSetWithTriggerDLSStress(version string) feature.FeatureSet {
+	return brokerFeatureSetWithTriggerDLS(true, NumDeployments, version)
 }
 
 // BrokerFeatureSetWithTriggerDLS returns all combinations of Broker X DeadLetterSinks,
 // each broker with all possible Triggers with the DeadLetterSink set on the Trigger.
-func brokerFeatureSetWithTriggerDLS(short bool, times int) feature.FeatureSet {
+func brokerFeatureSetWithTriggerDLS(short bool, times int, version string) feature.FeatureSet {
 	dls := deadLetterSinks
 	trgs := triggers
 	if short {
 		dls = deadLetterSinksShort
 		trgs = triggersShort
 	}
-	features := make([]*feature.Feature, 0, len(brokers)*len(dls))
-	for _, broker := range brokers {
+	brks := filterByVersion(brokers, version)
+	dls = filterByVersion(dls, version)
+	trgs = filterByVersion(trgs, version)
+	features := make([]*feature.Feature, 0, len(brks)*len(dls))
+	for _, broker := range brks {
 		for _, deadLetterSink := range dls {
 			for i := 0; i < times; i++ {
 				features = append(features, BrokerReadiness(i, broker, nil, trgs, deadLetterSink))