feat(EC-1868): bump conforma task sha with new script

simonbaird · simonbaird · commit 4d0a9de13d91 · 2026-06-12T12:24:40.000-04:00
This could be run automatically in future, but right now I'm running
it manually.

Also in this commit, check in the results of running the script so
we bump the actual git sha. Note that it updated it also in the todo
comments, which I think is a feature.

Signed-off-by: Simon Baird &lt;sbaird@redhat.com&gt;
Assisted-by: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/pipelines/managed/calunga-push-to-pulp/calunga-push-to-pulp.yaml b/pipelines/managed/calunga-push-to-pulp/calunga-push-to-pulp.yaml
@@ -192,7 +192,7 @@ spec:
     #      - name: url
     #        value: https://github.com/conforma/tekton-catalog
     #      - name: revision
-    #        value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+    #        value: "1383873048e9bb8626c0e4b37c93da433b12e339"
     #      - name: pathInRepo
     #        value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
     #
diff --git a/pipelines/managed/e2e/e2e.yaml b/pipelines/managed/e2e/e2e.yaml
@@ -107,7 +107,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/fbc-release/fbc-release.yaml b/pipelines/managed/fbc-release/fbc-release.yaml
@@ -236,7 +236,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-artifacts-to-cdn/push-artifacts-to-cdn.yaml b/pipelines/managed/push-artifacts-to-cdn/push-artifacts-to-cdn.yaml
@@ -240,7 +240,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-artifacts-to-storage/push-artifacts-to-storage.yaml b/pipelines/managed/push-artifacts-to-storage/push-artifacts-to-storage.yaml
@@ -203,7 +203,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-disk-images-to-cdn/push-disk-images-to-cdn.yaml b/pipelines/managed/push-disk-images-to-cdn/push-disk-images-to-cdn.yaml
@@ -230,7 +230,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-disk-images-to-marketplaces/push-disk-images-to-marketplaces.yaml b/pipelines/managed/push-disk-images-to-marketplaces/push-disk-images-to-marketplaces.yaml
@@ -236,7 +236,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-oot-kmods/push-oot-kmods.yaml b/pipelines/managed/push-oot-kmods/push-oot-kmods.yaml
@@ -308,7 +308,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-rpm-to-koji/push-rpm-to-koji.yaml b/pipelines/managed/push-rpm-to-koji/push-rpm-to-koji.yaml
@@ -203,7 +203,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-rpms-to-pulp/push-rpms-to-pulp.yaml b/pipelines/managed/push-rpms-to-pulp/push-rpms-to-pulp.yaml
@@ -329,7 +329,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-tekton-task-bundles-to-external-registry/push-tekton-task-bundles-to-external-registry.yaml b/pipelines/managed/push-tekton-task-bundles-to-external-registry/push-tekton-task-bundles-to-external-registry.yaml
@@ -266,7 +266,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-to-addons-registry/push-to-addons-registry.yaml b/pipelines/managed/push-to-addons-registry/push-to-addons-registry.yaml
@@ -267,7 +267,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/push-to-external-registry/push-to-external-registry.yaml b/pipelines/managed/push-to-external-registry/push-to-external-registry.yaml
@@ -316,7 +316,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/release-to-github/release-to-github.yaml b/pipelines/managed/release-to-github/release-to-github.yaml
@@ -227,7 +227,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/release-to-mrrc/release-to-mrrc.yaml b/pipelines/managed/release-to-mrrc/release-to-mrrc.yaml
@@ -206,7 +206,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/release-to-nrrc/release-to-nrrc.yaml b/pipelines/managed/release-to-nrrc/release-to-nrrc.yaml
@@ -206,7 +206,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/rh-advisories/rh-advisories.yaml b/pipelines/managed/rh-advisories/rh-advisories.yaml
@@ -380,7 +380,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/rh-push-helm-chart-to-registry-redhat-io/rh-push-helm-chart-to-registry-redhat-io.yaml b/pipelines/managed/rh-push-helm-chart-to-registry-redhat-io/rh-push-helm-chart-to-registry-redhat-io.yaml
@@ -328,7 +328,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/rh-push-to-external-registry/rh-push-to-external-registry.yaml b/pipelines/managed/rh-push-to-external-registry/rh-push-to-external-registry.yaml
@@ -333,7 +333,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/rh-push-to-registry-redhat-io/rh-push-to-registry-redhat-io.yaml b/pipelines/managed/rh-push-to-registry-redhat-io/rh-push-to-registry-redhat-io.yaml
@@ -299,7 +299,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/rh-rpm-advisories/rh-rpm-advisories.yaml b/pipelines/managed/rh-rpm-advisories/rh-rpm-advisories.yaml
@@ -223,7 +223,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/pipelines/managed/rhtap-service-push/rhtap-service-push.yaml b/pipelines/managed/rhtap-service-push/rhtap-service-push.yaml
@@ -275,7 +275,7 @@ spec:
           - name: url
             value: https://github.com/conforma/tekton-catalog
           - name: revision
-            value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"
+            value: "1383873048e9bb8626c0e4b37c93da433b12e339"
           - name: pathInRepo
             value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"
       params:
diff --git a/scripts/bump-conforma-revision.sh b/scripts/bump-conforma-revision.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# The Conforma task used in the pipelines in this repo is accessed with a git
+# resolver, pinned for stability with a specific git sha. This script is used
+# to update the git sha across all the pipelines to the current latest konflux
+# branch.
+#
+# See also this workflow which updates the konflux branch in that repo:
+# https://github.com/conforma/infra-deployments-ci/actions/workflows/konflux-policy.yaml
+#
+# It's likely this will be used in another GitHub workflow to either create a
+# PR with this update, or perhaps to push it directly, but at time of writing
+# this is not yet implemented.
+
+REPO_URL="https://github.com/conforma/tekton-catalog"
+BRANCH="konflux"
+
+NEW_REV=$(git ls-remote "${REPO_URL}" "refs/heads/${BRANCH}" | cut -f1)
+
+if [[ -z "${NEW_REV}" ]]; then
+    echo "Error: could not resolve HEAD of ${BRANCH} branch in ${REPO_URL}" >&2
+    exit 1
+fi
+
+echo "Updating conforma/tekton-catalog revision to ${NEW_REV}"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+count=0
+while IFS= read -r file; do
+    if sed -i -E \
+        "/name: url/{N;/value: https:\/\/github\.com\/conforma\/tekton-catalog/{N;/name: revision/{N;s|(value: \")[a-f0-9]+(\")|\1${NEW_REV}\2|}}}" \
+        "${file}"; then
+        count=$((count + 1))
+    fi
+done < <(grep -rl "${REPO_URL}" "${REPO_ROOT}/pipelines/")
+
+echo "Updated ${count} files"

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ spec:`
`192`	`192`	`# - name: url`
`193`	`193`	`# value: https://github.com/conforma/tekton-catalog`
`194`	`194`	`# - name: revision`
`195`		`- # value: "515fb114f8cfeb9206ec5ffb90a6f9cf851cc941"`
	`195`	`+ # value: "1383873048e9bb8626c0e4b37c93da433b12e339"`
`196`	`196`	`# - name: pathInRepo`
`197`	`197`	`# value: "tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml"`
`198`	`198`	`#`