From 5bbd74c7ea0841805baaad6627bf27bd88fda714 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Mon, 10 Feb 2025 14:24:31 +0100
Subject: [PATCH 01/10] add custom task and use it to determine the image
 expiration without any logic (pass-through)

---
 .tekton/basic-component-pipeline.yaml         | 19 +++++++---
 ...rmine-image-expiration-parameter-task.yaml | 37 +++++++++++++++++++
 2 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 .tekton/determine-image-expiration-parameter-task.yaml

diff --git a/.tekton/basic-component-pipeline.yaml b/.tekton/basic-component-pipeline.yaml
index bab9b88a2a843..286f5f25e0743 100644
--- a/.tekton/basic-component-pipeline.yaml
+++ b/.tekton/basic-component-pipeline.yaml
@@ -142,6 +142,13 @@ spec:
         value: task
       resolver: bundles
 
+  - name: determine-image-expiration
+    params:
+      - name: DEFAULT_IMAGE_EXPIRES_AFTER
+        value: $(params.image-expires-after)
+    taskRef:
+      name: determine-image-expiration-parameter
+
   - name: clone-repository
     params:
     - name: url
@@ -227,7 +234,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -264,7 +271,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -303,7 +310,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -342,7 +349,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -381,7 +388,7 @@ spec:
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     taskRef:
       params:
       - name: name
@@ -409,7 +416,7 @@ spec:
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     taskRef:
       params:
       - name: name
diff --git a/.tekton/determine-image-expiration-parameter-task.yaml b/.tekton/determine-image-expiration-parameter-task.yaml
new file mode 100644
index 0000000000000..7ae48d5c6f1a8
--- /dev/null
+++ b/.tekton/determine-image-expiration-parameter-task.yaml
@@ -0,0 +1,37 @@
+apiVersion: tekton.dev/v1
+kind: Task
+metadata:
+  name: determine-image-expiration-parameter
+spec:
+  description: Determines the image expiration parameter, or set empty for release images.
+  params:
+  - name: DEFAULT_IMAGE_EXPIRES_AFTER
+    description: Default image expiration.
+    type: string
+  results:
+  - name: IMAGE_EXPIRES_AFTER
+    description: Image expiration as a duration, e.g. `13w`.
+  steps:
+  - name: determine-image-expiration-parameter
+    image: registry.access.redhat.com/ubi9:latest@sha256:53d6c19d664f4f418ce5c823d3a33dbb562a2550ea249cf07ef10aa063ace38f
+    env:
+    - name: EVENT_TYPE
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.labels['pipelinesascode.tekton.dev/event-type']
+    - name: TARGET_BRANCH
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.annotations['build.appstudio.redhat.com/target_branch']
+    script: |
+      #!/usr/bin/env bash
+
+      set -euo pipefail
+
+      echo "Default image expiration: $(params.DEFAULT_IMAGE_EXPIRES_AFTER)"
+      echo "Event type: ${EVENT_TYPE}"
+      echo "Target branch: ${TARGET_BRANCH}"
+
+      IMAGE_EXPIRES_AFTER="$(params.DEFAULT_IMAGE_EXPIRES_AFTER)"
+
+      echo -n "${IMAGE_EXPIRES_AFTER}" | tee "$(results.IMAGE_EXPIRES_AFTER.path)"

From c957efdf594e97b8df5af769949c66308b871e02 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Mon, 10 Feb 2025 16:02:09 +0100
Subject: [PATCH 02/10] update task definition

---
 .tekton/determine-image-expiration-parameter-task.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.tekton/determine-image-expiration-parameter-task.yaml b/.tekton/determine-image-expiration-parameter-task.yaml
index 7ae48d5c6f1a8..546cc52251c76 100644
--- a/.tekton/determine-image-expiration-parameter-task.yaml
+++ b/.tekton/determine-image-expiration-parameter-task.yaml
@@ -32,6 +32,10 @@ spec:
       echo "Event type: ${EVENT_TYPE}"
       echo "Target branch: ${TARGET_BRANCH}"
 
-      IMAGE_EXPIRES_AFTER="$(params.DEFAULT_IMAGE_EXPIRES_AFTER)"
-
+      # TODO(ROX-...): Do not let master images expire for fast stream releases
+      if [[ "${EVENT_TYPE}" == "push" && "${TARGET_BRANCH}" == refs/tags/* ]]; then
+        IMAGE_EXPIRES_AFTER=""
+      else
+        IMAGE_EXPIRES_AFTER="${params.DEFAULT_IMAGE_EXPIRES_AFTER}"
+      fi
       echo -n "${IMAGE_EXPIRES_AFTER}" | tee "$(results.IMAGE_EXPIRES_AFTER.path)"

From 2aafbd8cd93189695ab03706017b20f0a55e63c3 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Mon, 10 Feb 2025 16:07:13 +0100
Subject: [PATCH 03/10] fix

---
 .tekton/determine-image-expiration-parameter-task.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tekton/determine-image-expiration-parameter-task.yaml b/.tekton/determine-image-expiration-parameter-task.yaml
index 546cc52251c76..4348d42480597 100644
--- a/.tekton/determine-image-expiration-parameter-task.yaml
+++ b/.tekton/determine-image-expiration-parameter-task.yaml
@@ -36,6 +36,6 @@ spec:
       if [[ "${EVENT_TYPE}" == "push" && "${TARGET_BRANCH}" == refs/tags/* ]]; then
         IMAGE_EXPIRES_AFTER=""
       else
-        IMAGE_EXPIRES_AFTER="${params.DEFAULT_IMAGE_EXPIRES_AFTER}"
+        IMAGE_EXPIRES_AFTER="$(params.DEFAULT_IMAGE_EXPIRES_AFTER)"
       fi
       echo -n "${IMAGE_EXPIRES_AFTER}" | tee "$(results.IMAGE_EXPIRES_AFTER.path)"

From 285c26636e81783355cb23e81ecf8bd53838c3a6 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Mon, 10 Feb 2025 16:16:07 +0100
Subject: [PATCH 04/10] update text

---
 .tekton/determine-image-expiration-parameter-task.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tekton/determine-image-expiration-parameter-task.yaml b/.tekton/determine-image-expiration-parameter-task.yaml
index 4348d42480597..80916dc86707f 100644
--- a/.tekton/determine-image-expiration-parameter-task.yaml
+++ b/.tekton/determine-image-expiration-parameter-task.yaml
@@ -3,7 +3,7 @@ kind: Task
 metadata:
   name: determine-image-expiration-parameter
 spec:
-  description: Determines the image expiration parameter, or set empty for release images.
+  description: Determines the image expiration parameter, or sets to empty for release images.
   params:
   - name: DEFAULT_IMAGE_EXPIRES_AFTER
     description: Default image expiration.
@@ -32,7 +32,7 @@ spec:
       echo "Event type: ${EVENT_TYPE}"
       echo "Target branch: ${TARGET_BRANCH}"
 
-      # TODO(ROX-...): Do not let master images expire for fast stream releases
+      # TODO(ROX-28001): Update the expiration logic for -fast releases.
       if [[ "${EVENT_TYPE}" == "push" && "${TARGET_BRANCH}" == refs/tags/* ]]; then
         IMAGE_EXPIRES_AFTER=""
       else

From 528bb2ad382739d9c9c45168ecbc0115debcaa33 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Mon, 10 Feb 2025 16:18:23 +0100
Subject: [PATCH 05/10] ensure logic works

---
 .tekton/determine-image-expiration-parameter-task.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.tekton/determine-image-expiration-parameter-task.yaml b/.tekton/determine-image-expiration-parameter-task.yaml
index 80916dc86707f..8621dad025f9c 100644
--- a/.tekton/determine-image-expiration-parameter-task.yaml
+++ b/.tekton/determine-image-expiration-parameter-task.yaml
@@ -33,7 +33,8 @@ spec:
       echo "Target branch: ${TARGET_BRANCH}"
 
       # TODO(ROX-28001): Update the expiration logic for -fast releases.
-      if [[ "${EVENT_TYPE}" == "push" && "${TARGET_BRANCH}" == refs/tags/* ]]; then
+      # if [[ "${EVENT_TYPE}" == "push" && "${TARGET_BRANCH}" == refs/tags/* ]]; then
+      if [[ "${EVENT_TYPE}" == "pull_request" && "${TARGET_BRANCH}" == "master" ]]; then
         IMAGE_EXPIRES_AFTER=""
       else
         IMAGE_EXPIRES_AFTER="$(params.DEFAULT_IMAGE_EXPIRES_AFTER)"

From 310c6863a201f7dd38ef12bdce46a4437a64f591 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Tue, 11 Feb 2025 11:04:12 +0100
Subject: [PATCH 06/10] use task bundle and update all pipeline definitions

---
 .tekton/basic-component-pipeline.yaml         |  9 +++-
 ...rmine-image-expiration-parameter-task.yaml | 42 -------------------
 .tekton/main-pipeline.yaml                    | 26 +++++++++---
 .tekton/operator-bundle-pipeline.yaml         | 16 ++++++-
 .tekton/scanner-v4-pipeline.yaml              | 14 +++++++
 5 files changed, 57 insertions(+), 50 deletions(-)
 delete mode 100644 .tekton/determine-image-expiration-parameter-task.yaml

diff --git a/.tekton/basic-component-pipeline.yaml b/.tekton/basic-component-pipeline.yaml
index 286f5f25e0743..ae2365792f8cb 100644
--- a/.tekton/basic-component-pipeline.yaml
+++ b/.tekton/basic-component-pipeline.yaml
@@ -147,7 +147,14 @@ spec:
       - name: DEFAULT_IMAGE_EXPIRES_AFTER
         value: $(params.image-expires-after)
     taskRef:
-      name: determine-image-expiration-parameter
+      params:
+      - name: name
+        value: determine-image-expiration-parameter
+      - name: bundle
+        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+      - name: kind
+        value: task
+      resolver: bundles
 
   - name: clone-repository
     params:
diff --git a/.tekton/determine-image-expiration-parameter-task.yaml b/.tekton/determine-image-expiration-parameter-task.yaml
deleted file mode 100644
index 8621dad025f9c..0000000000000
--- a/.tekton/determine-image-expiration-parameter-task.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: Task
-metadata:
-  name: determine-image-expiration-parameter
-spec:
-  description: Determines the image expiration parameter, or sets to empty for release images.
-  params:
-  - name: DEFAULT_IMAGE_EXPIRES_AFTER
-    description: Default image expiration.
-    type: string
-  results:
-  - name: IMAGE_EXPIRES_AFTER
-    description: Image expiration as a duration, e.g. `13w`.
-  steps:
-  - name: determine-image-expiration-parameter
-    image: registry.access.redhat.com/ubi9:latest@sha256:53d6c19d664f4f418ce5c823d3a33dbb562a2550ea249cf07ef10aa063ace38f
-    env:
-    - name: EVENT_TYPE
-      valueFrom:
-        fieldRef:
-          fieldPath: metadata.labels['pipelinesascode.tekton.dev/event-type']
-    - name: TARGET_BRANCH
-      valueFrom:
-        fieldRef:
-          fieldPath: metadata.annotations['build.appstudio.redhat.com/target_branch']
-    script: |
-      #!/usr/bin/env bash
-
-      set -euo pipefail
-
-      echo "Default image expiration: $(params.DEFAULT_IMAGE_EXPIRES_AFTER)"
-      echo "Event type: ${EVENT_TYPE}"
-      echo "Target branch: ${TARGET_BRANCH}"
-
-      # TODO(ROX-28001): Update the expiration logic for -fast releases.
-      # if [[ "${EVENT_TYPE}" == "push" && "${TARGET_BRANCH}" == refs/tags/* ]]; then
-      if [[ "${EVENT_TYPE}" == "pull_request" && "${TARGET_BRANCH}" == "master" ]]; then
-        IMAGE_EXPIRES_AFTER=""
-      else
-        IMAGE_EXPIRES_AFTER="$(params.DEFAULT_IMAGE_EXPIRES_AFTER)"
-      fi
-      echo -n "${IMAGE_EXPIRES_AFTER}" | tee "$(results.IMAGE_EXPIRES_AFTER.path)"
diff --git a/.tekton/main-pipeline.yaml b/.tekton/main-pipeline.yaml
index 686d5a82b125c..5a297d7e8e416 100644
--- a/.tekton/main-pipeline.yaml
+++ b/.tekton/main-pipeline.yaml
@@ -142,6 +142,20 @@ spec:
         value: task
       resolver: bundles
 
+  - name: determine-image-expiration
+    params:
+      - name: DEFAULT_IMAGE_EXPIRES_AFTER
+        value: $(params.image-expires-after)
+    taskRef:
+      params:
+      - name: name
+        value: determine-image-expiration-parameter
+      - name: bundle
+        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+      - name: kind
+        value: task
+      resolver: bundles
+
   - name: clone-repository
     params:
     - name: url
@@ -247,7 +261,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -288,7 +302,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -330,7 +344,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -372,7 +386,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -412,7 +426,7 @@ spec:
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     taskRef:
       params:
       - name: name
@@ -440,7 +454,7 @@ spec:
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     taskRef:
       params:
       - name: name
diff --git a/.tekton/operator-bundle-pipeline.yaml b/.tekton/operator-bundle-pipeline.yaml
index 3ae5feee12fe3..3598424564c18 100644
--- a/.tekton/operator-bundle-pipeline.yaml
+++ b/.tekton/operator-bundle-pipeline.yaml
@@ -244,6 +244,20 @@ spec:
         value: task
       resolver: bundles
 
+  - name: determine-image-expiration
+    params:
+      - name: DEFAULT_IMAGE_EXPIRES_AFTER
+        value: $(params.image-expires-after)
+    taskRef:
+      params:
+      - name: name
+        value: determine-image-expiration-parameter
+      - name: bundle
+        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+      - name: kind
+        value: task
+      resolver: bundles
+
   - name: clone-repository
     params:
     - name: url
@@ -426,7 +440,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
diff --git a/.tekton/scanner-v4-pipeline.yaml b/.tekton/scanner-v4-pipeline.yaml
index 033607606437a..129354cd76451 100644
--- a/.tekton/scanner-v4-pipeline.yaml
+++ b/.tekton/scanner-v4-pipeline.yaml
@@ -142,6 +142,20 @@ spec:
         value: task
       resolver: bundles
 
+  - name: determine-image-expiration
+    params:
+      - name: DEFAULT_IMAGE_EXPIRES_AFTER
+        value: $(params.image-expires-after)
+    taskRef:
+      params:
+      - name: name
+        value: determine-image-expiration-parameter
+      - name: bundle
+        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+      - name: kind
+        value: task
+      resolver: bundles
+
   - name: clone-repository
     params:
     - name: url

From 4e62bcfc4dde6b1c9b4fde4c17cea27454f2486b Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Tue, 11 Feb 2025 11:05:59 +0100
Subject: [PATCH 07/10] update remaining pipeline

---
 .tekton/scanner-v4-pipeline.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.tekton/scanner-v4-pipeline.yaml b/.tekton/scanner-v4-pipeline.yaml
index 129354cd76451..2fdd718372fbf 100644
--- a/.tekton/scanner-v4-pipeline.yaml
+++ b/.tekton/scanner-v4-pipeline.yaml
@@ -261,7 +261,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -298,7 +298,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -337,7 +337,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -376,7 +376,7 @@ spec:
     - name: PREFETCH_INPUT
       value: $(params.prefetch-input)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     - name: COMMIT_SHA
       value: $(tasks.clone-repository.results.commit)
     - name: BUILD_ARGS
@@ -415,7 +415,7 @@ spec:
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     taskRef:
       params:
       - name: name
@@ -443,7 +443,7 @@ spec:
       - $(tasks.build-container-ppc64le.results.IMAGE_REF)
       - $(tasks.build-container-arm64.results.IMAGE_REF)
     - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
+      value: $(tasks.determine-image-expiration.results.IMAGE_EXPIRES_AFTER)
     taskRef:
       params:
       - name: name

From 6fa77e2bd4afafa19e74716abcef21f9b9ac6d12 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Tue, 11 Feb 2025 11:21:47 +0100
Subject: [PATCH 08/10] fix runAfter of operator-bundle pipeline

---
 .tekton/operator-bundle-pipeline.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.tekton/operator-bundle-pipeline.yaml b/.tekton/operator-bundle-pipeline.yaml
index 3598424564c18..6ce9698abf0d5 100644
--- a/.tekton/operator-bundle-pipeline.yaml
+++ b/.tekton/operator-bundle-pipeline.yaml
@@ -657,6 +657,7 @@ spec:
     - clamav-scan
     - clone-repository
     - deprecated-base-image-check
+    - determine-image-expiration
     - determine-image-tag
     - init
     - prefetch-dependencies

From 8da2900d79575e1aeaa3eb9a9d08825150b2696d Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 13 Feb 2025 16:54:49 +0100
Subject: [PATCH 09/10] update task digest and name

---
 .tekton/basic-component-pipeline.yaml | 2 +-
 .tekton/main-pipeline.yaml            | 2 +-
 .tekton/operator-bundle-pipeline.yaml | 2 +-
 .tekton/scanner-v4-pipeline.yaml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.tekton/basic-component-pipeline.yaml b/.tekton/basic-component-pipeline.yaml
index ae2365792f8cb..8b12921c512e2 100644
--- a/.tekton/basic-component-pipeline.yaml
+++ b/.tekton/basic-component-pipeline.yaml
@@ -149,7 +149,7 @@ spec:
     taskRef:
       params:
       - name: name
-        value: determine-image-expiration-parameter
+        value: determine-image-expiration
       - name: bundle
         value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
       - name: kind
diff --git a/.tekton/main-pipeline.yaml b/.tekton/main-pipeline.yaml
index 5a297d7e8e416..2a76447bd0513 100644
--- a/.tekton/main-pipeline.yaml
+++ b/.tekton/main-pipeline.yaml
@@ -149,7 +149,7 @@ spec:
     taskRef:
       params:
       - name: name
-        value: determine-image-expiration-parameter
+        value: determine-image-expiration
       - name: bundle
         value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
       - name: kind
diff --git a/.tekton/operator-bundle-pipeline.yaml b/.tekton/operator-bundle-pipeline.yaml
index 6ce9698abf0d5..509dc95c9dc82 100644
--- a/.tekton/operator-bundle-pipeline.yaml
+++ b/.tekton/operator-bundle-pipeline.yaml
@@ -251,7 +251,7 @@ spec:
     taskRef:
       params:
       - name: name
-        value: determine-image-expiration-parameter
+        value: determine-image-expiration
       - name: bundle
         value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
       - name: kind
diff --git a/.tekton/scanner-v4-pipeline.yaml b/.tekton/scanner-v4-pipeline.yaml
index 2fdd718372fbf..8924e4df2ec5d 100644
--- a/.tekton/scanner-v4-pipeline.yaml
+++ b/.tekton/scanner-v4-pipeline.yaml
@@ -149,7 +149,7 @@ spec:
     taskRef:
       params:
       - name: name
-        value: determine-image-expiration-parameter
+        value: determine-image-expiration
       - name: bundle
         value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
       - name: kind

From 5ee054eefb6239d07a713b92d46b9766f173f597 Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Thu, 13 Feb 2025 16:58:10 +0100
Subject: [PATCH 10/10] update task digest and name

---
 .tekton/basic-component-pipeline.yaml | 2 +-
 .tekton/main-pipeline.yaml            | 2 +-
 .tekton/operator-bundle-pipeline.yaml | 2 +-
 .tekton/scanner-v4-pipeline.yaml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.tekton/basic-component-pipeline.yaml b/.tekton/basic-component-pipeline.yaml
index 8b12921c512e2..da451c5ba59ad 100644
--- a/.tekton/basic-component-pipeline.yaml
+++ b/.tekton/basic-component-pipeline.yaml
@@ -151,7 +151,7 @@ spec:
       - name: name
         value: determine-image-expiration
       - name: bundle
-        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+        value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/main-pipeline.yaml b/.tekton/main-pipeline.yaml
index 2a76447bd0513..a3c9cb60ed75e 100644
--- a/.tekton/main-pipeline.yaml
+++ b/.tekton/main-pipeline.yaml
@@ -151,7 +151,7 @@ spec:
       - name: name
         value: determine-image-expiration
       - name: bundle
-        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+        value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/operator-bundle-pipeline.yaml b/.tekton/operator-bundle-pipeline.yaml
index 509dc95c9dc82..050d740e70ef7 100644
--- a/.tekton/operator-bundle-pipeline.yaml
+++ b/.tekton/operator-bundle-pipeline.yaml
@@ -253,7 +253,7 @@ spec:
       - name: name
         value: determine-image-expiration
       - name: bundle
-        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+        value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/scanner-v4-pipeline.yaml b/.tekton/scanner-v4-pipeline.yaml
index 8924e4df2ec5d..74ce595cb4e69 100644
--- a/.tekton/scanner-v4-pipeline.yaml
+++ b/.tekton/scanner-v4-pipeline.yaml
@@ -151,7 +151,7 @@ spec:
       - name: name
         value: determine-image-expiration
       - name: bundle
-        value: quay.io/rhacs-eng/konflux-tasks:pr-37@sha256:ab8a234b7e78cbaea42626f23ec3da0b4872fce4058128b6e066e4c3e846a366
+        value: quay.io/rhacs-eng/konflux-tasks:latest@sha256:e557f9ca3e3d31f48127c3528c2c2647f4b49e2d72dce022c85fbe121c113ecd
       - name: kind
         value: task
       resolver: bundles