Add new midstream branches and update pipelines

config/backstage-plugins.yaml

@@ -74,6 +74,19 @@ config:
       - onDemand: true
         version: "4.14"
       promotion: {}
+    release-v1.21:
+      konflux:
+        enabled: true
+      openShiftVersions:
+      - candidateRelease: true
+        onDemand: true
+        skipCron: true
+        version: "4.21"
+      - useClusterPool: true
+        version: "4.20"
+      - onDemand: true
+        version: "4.14"
+      promotion: {}
 repositories:
 - dockerfiles: {}
   e2e:

config/client.yaml

@@ -86,6 +86,21 @@ config:
         useClusterPool: true
         version: "4.20"
       promotion: {}
+    release-v1.21:
+      konflux:
+        enabled: true
+        imageOverrides:
+        - name: CLI_ARTIFACTS
+          pullSpec: brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
+      openShiftVersions:
+      - candidateRelease: true
+        onDemand: true
+        skipCron: true
+        version: "4.21"
+      - skipCron: true
+        useClusterPool: true
+        version: "4.20"
+      promotion: {}
 repositories:
 - canonicalGoRepository: github.com/knative/client
   dockerfiles: {}

config/eventing-integrations.yaml

@@ -143,6 +143,30 @@ config:
       promotion: {}
       skipDockerFilesMatches:
       - .*hermetic.*
+    release-v1.21:
+      konflux:
+        enabled: true
+        javaImages:
+        - .*eventing-integrations-aws-ddb-streams-source
+        - .*eventing-integrations-aws-s3-sink
+        - .*eventing-integrations-aws-s3-source
+        - .*eventing-integrations-aws-sns-sink
+        - .*eventing-integrations-aws-sqs-sink
+        - .*eventing-integrations-aws-sqs-source
+        - .*eventing-integrations-log-sink
+        - .*eventing-integrations-timer-source
+      openShiftVersions:
+      - candidateRelease: true
+        onDemand: true
+        skipCron: true
+        version: "4.21"
+      - useClusterPool: true
+        version: "4.20"
+      - onDemand: true
+        version: "4.14"
+      promotion: {}
+      skipDockerFilesMatches:
+      - .*hermetic.*
 repositories:
 - dockerfiles: {}
   e2e:

config/eventing-istio.yaml

@@ -73,6 +73,15 @@ config:
       - onDemand: true
         version: "4.14"
       promotion: {}
+    release-v1.21:
+      konflux:
+        enabled: true
+      openShiftVersions:
+      - useClusterPool: true
+        version: "4.20"
+      - onDemand: true
+        version: "4.14"
+      promotion: {}
 repositories:
 - dockerfiles: {}
   e2e:

config/eventing-kafka-broker.yaml

@@ -109,6 +109,20 @@ config:
       promotion: {}
       skipDockerFilesMatches:
       - .*hermetic.*
+    release-v1.21:
+      konflux:
+        enabled: true
+        javaImages:
+        - .*eventing-kafka-broker-receiver
+        - .*eventing-kafka-broker-dispatcher
+      openShiftVersions:
+      - useClusterPool: true
+        version: "4.20"
+      - onDemand: true
+        version: "4.14"
+      promotion: {}
+      skipDockerFilesMatches:
+      - .*hermetic.*
 repositories:
 - dockerfiles: {}
   e2e:

config/eventing.yaml

@@ -85,6 +85,19 @@ config:
       - onDemand: true
         version: "4.14"
       promotion: {}
+    release-v1.21:
+      konflux:
+        enabled: true
+      openShiftVersions:
+      - candidateRelease: true
+        onDemand: true
+        skipCron: true
+        version: "4.21"
+      - useClusterPool: true
+        version: "4.20"
+      - onDemand: true
+        version: "4.14"
+      promotion: {}
 repositories:
 - dockerfiles: {}
   e2e:

config/kn-plugin-event.yaml

@@ -54,6 +54,14 @@ config:
         useClusterPool: true
         version: "4.20"
       promotion: {}
+    release-1.21:
+      konflux:
+        enabled: true
+      openShiftVersions:
+      - skipCron: true
+        useClusterPool: true
+        version: "4.20"
+      promotion: {}
     release-next:
       openShiftVersions:
       - skipCron: true

config/kn-plugin-func.yaml

@@ -65,6 +65,14 @@ config:
         useClusterPool: true
         version: "4.20"
       promotion: {}
+    release-v1.21:
+      konflux:
+        enabled: true
+      openShiftVersions:
+      - skipCron: true
+        useClusterPool: true
+        version: "4.20"
+      promotion: {}
 repositories:
 - dockerfiles: {}
   ignoreConfigs: {}

config/serverless-operator.yaml

@@ -420,8 +420,8 @@ repositories:
               scenario serverless
           test:
           - as: operator-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true MAP_TESTS=true
-              make test-e2e-with-kafka
+            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
+              MAP_TESTS=true make test-e2e-with-kafka
             from: serverless-source-image
             resources:
               limits:
@@ -430,8 +430,8 @@ repositories:
                 cpu: 100m
                 memory: 200Mi
           - as: knative-serving-eventing-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true MAP_TESTS=true
-              make test-upstream-e2e-no-upgrade
+            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
+              MAP_TESTS=true make test-upstream-e2e-no-upgrade
             from: serverless-source-image
             resources:
               limits:
@@ -440,8 +440,8 @@ repositories:
                 cpu: 100m
                 memory: 200Mi
           - as: knative-eventing-kafka-broker-e2e
-            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true MAP_TESTS=true
-              make test-upstream-e2e-kafka-no-upgrade
+            commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true
+              MAP_TESTS=true make test-upstream-e2e-kafka-no-upgrade
             from: serverless-source-image
             resources:
               limits:

pkg/konfluxgen/bundle-build.yaml

@@ -53,10 +53,6 @@ spec:
       path-context
     name: dockerfile
     type: string
-  - default: "false"
-    description: Force rebuild image
-    name: rebuild
-    type: string
   - default: "false"
     description: Skip checks against built image
     name: skip-checks
@@ -164,15 +160,10 @@ spec:
       - name: name
         value: buildah-remote-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:7aa7141697734e450c6f91db0c545fb46bd4de1b0203812cf594459d11ea3e63
+        value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: sast-snyk-check
     params:
     - name: ARGS
@@ -220,7 +211,7 @@ spec:
       - name: name
         value: prefetch-dependencies-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c651d767709bea1bb2f52c37d19d332af4706fbbfe450724e314b286597795a2
+        value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6
       - name: kind
         value: task
       resolver: bundles
@@ -250,20 +241,14 @@ spec:
       resolver: bundles
   - name: init
     params:
-    - name: image-url
-      value: $(params.output-image)
-    - name: rebuild
-      value: $(params.rebuild)
-    - name: skip-checks
-      value: $(params.skip-checks)
     - name: enable-cache-proxy
       value: $(params.enable-cache-proxy)
     taskRef:
       params:
       - name: name
         value: init
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82
+        value: quay.io/konflux-ci/tekton-catalog/task-init:0.3@sha256:aa6f8632cc23d605c5942505ff1d00280db16a6fda5c4c56c4ed9ae936b5fbc6
       - name: kind
         value: task
       resolver: bundles
@@ -288,11 +273,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
     workspaces:
     - name: basic-auth
       workspace: git-auth
@@ -318,15 +298,10 @@ spec:
       - name: name
         value: build-image-index
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:05d3d8a5ded44c51b074a56a408ddf5d65c56b4c15e110abb1a99e3aff269d49
+        value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: build-source-image
     params:
     - name: BINARY_IMAGE
@@ -349,10 +324,6 @@ spec:
         value: task
       resolver: bundles
     when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
     - input: $(params.build-source-image)
       operator: in
       values:
@@ -504,7 +475,7 @@ spec:
       - name: name
         value: push-dockerfile-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e
+        value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:6fb61bec5ef161225a850005233db68cfdc03ad54e1a54cc49cc98d98ea3d259
       - name: kind
         value: task
       resolver: bundles
@@ -521,7 +492,7 @@ spec:
       - name: name
         value: rpms-signature-scan
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:f2df541f49b5310f343b55f58b0881a46a2b46c5df39a9c34563c5042b106f6f
+        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a99d8fd4c9027356b18e5d2910cc44dbc2fcb53c384ba34696645d9e7faa9084
       - name: kind
         value: task
       resolver: bundles