Issue #1512: RHOAIENG-30439: tekton: update on-comment regex to support multiple components in PipelineRun definitions (#1514)

jiridanek · web-flow · commit 9fef62b4c53d · 2025-08-01T11:33:47.000+02:00
* update regex to support whitespace and ensure `main()` exits properly

* escape `component` and `dockerfile.parent` in `on-comment` regexp for safety
diff --git a/.tekton/odh-pipeline-runtime-datascience-cpu-py311-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-datascience-cpu-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/datascience/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-datascience\-cpu\-py311\-ubi9|runtimes/datascience/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-datascience-cpu-py312-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-datascience-cpu-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/datascience/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-datascience\-cpu\-py312\-ubi9|runtimes/datascience/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-minimal-cpu-py311-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-minimal-cpu-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/minimal/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-minimal\-cpu\-py311\-ubi9|runtimes/minimal/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-minimal-cpu-py312-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-minimal-cpu-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/minimal/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-minimal\-cpu\-py312\-ubi9|runtimes/minimal/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-pytorch-cuda-py311-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-pytorch-cuda-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/pytorch/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-pytorch\-cuda\-py311\-ubi9|runtimes/pytorch/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-pytorch-cuda-py312-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-pytorch-cuda-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/pytorch/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-pytorch\-cuda\-py312\-ubi9|runtimes/pytorch/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-pytorch-rocm-py311-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-pytorch-rocm-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/rocm-pytorch/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-pytorch\-rocm\-py311\-ubi9|runtimes/rocm\-pytorch/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-pytorch-rocm-py312-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-pytorch-rocm-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/rocm-pytorch/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-pytorch\-rocm\-py312\-ubi9|runtimes/rocm\-pytorch/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-tensorflow-cuda-py311-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-tensorflow-cuda-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/tensorflow/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-tensorflow\-cuda\-py311\-ubi9|runtimes/tensorflow/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-tensorflow-cuda-py312-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-tensorflow-cuda-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/tensorflow/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-tensorflow\-cuda\-py312\-ubi9|runtimes/tensorflow/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-tensorflow-rocm-py311-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-tensorflow-rocm-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/rocm-tensorflow/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-tensorflow\-rocm\-py311\-ubi9|runtimes/rocm\-tensorflow/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-pipeline-runtime-tensorflow-rocm-py312-ubi9-pull-request.yaml b/.tekton/odh-pipeline-runtime-tensorflow-rocm-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild runtimes/rocm-tensorflow/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-pipeline\-runtime\-tensorflow\-rocm\-py312\-ubi9|runtimes/rocm\-tensorflow/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-codeserver-datascience-cpu-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-codeserver-datascience-cpu-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild codeserver/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-codeserver\-datascience\-cpu\-py311\-ubi9|codeserver/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-codeserver-datascience-cpu-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-codeserver-datascience-cpu-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild codeserver/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-codeserver\-datascience\-cpu\-py312\-ubi9|codeserver/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-datascience-cpu-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-datascience-cpu-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/datascience/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-datascience\-cpu\-py311\-ubi9|jupyter/datascience/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-datascience-cpu-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-datascience-cpu-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/datascience/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-datascience\-cpu\-py312\-ubi9|jupyter/datascience/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-minimal-cpu-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-minimal-cpu-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/minimal/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-minimal\-cpu\-py311\-ubi9|jupyter/minimal/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-minimal-cpu-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-minimal-cpu-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/minimal/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-minimal\-cpu\-py312\-ubi9|jupyter/minimal/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-minimal-cuda-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-minimal-cuda-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/minimal/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-minimal\-cuda\-py311\-ubi9|jupyter/minimal/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-minimal-cuda-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-minimal-cuda-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/minimal/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-minimal\-cuda\-py312\-ubi9|jupyter/minimal/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-minimal-rocm-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-minimal-rocm-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/minimal/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-minimal\-rocm\-py311\-ubi9|jupyter/minimal/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-minimal-rocm-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-minimal-rocm-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/minimal/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-minimal\-rocm\-py312\-ubi9|jupyter/minimal/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-pytorch-cuda-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-pytorch-cuda-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/pytorch/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-pytorch\-cuda\-py311\-ubi9|jupyter/pytorch/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-pytorch-cuda-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-pytorch-cuda-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/pytorch/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-pytorch\-cuda\-py312\-ubi9|jupyter/pytorch/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-pytorch-rocm-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-pytorch-rocm-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/rocm/pytorch/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-pytorch\-rocm\-py311\-ubi9|jupyter/rocm/pytorch/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-pytorch-rocm-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-pytorch-rocm-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/rocm/pytorch/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-pytorch\-rocm\-py312\-ubi9|jupyter/rocm/pytorch/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-tensorflow-cuda-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/tensorflow/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-tensorflow\-cuda\-py311\-ubi9|jupyter/tensorflow/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-tensorflow-cuda-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-tensorflow-cuda-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/tensorflow/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-tensorflow\-cuda\-py312\-ubi9|jupyter/tensorflow/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-tensorflow-rocm-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/rocm/tensorflow/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-tensorflow\-rocm\-py311\-ubi9|jupyter/rocm/tensorflow/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-tensorflow-rocm-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-tensorflow-rocm-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/rocm/tensorflow/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-tensorflow\-rocm\-py312\-ubi9|jupyter/rocm/tensorflow/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-trustyai-cpu-py311-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-trustyai-cpu-py311-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/trustyai/ubi9-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-trustyai\-cpu\-py311\-ubi9|jupyter/trustyai/ubi9\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-jupyter-trustyai-cpu-py312-ubi9-pull-request.yaml b/.tekton/odh-workbench-jupyter-trustyai-cpu-py312-ubi9-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild jupyter/trustyai/ubi9-python-3.12
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-jupyter\-trustyai\-cpu\-py312\-ubi9|jupyter/trustyai/ubi9\-python\-3\.12)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-rstudio-minimal-cpu-py311-c9s-pull-request.yaml b/.tekton/odh-workbench-rstudio-minimal-cpu-py311-c9s-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild rstudio/c9s-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-rstudio\-minimal\-cpu\-py311\-c9s|rstudio/c9s\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/.tekton/odh-workbench-rstudio-minimal-cuda-py311-c9s-pull-request.yaml b/.tekton/odh-workbench-rstudio-minimal-cuda-py311-c9s-pull-request.yaml
@@ -11,7 +11,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: 'true'
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-comment: ^/kfbuild rstudio/c9s-python-3.11
+    pipelinesascode.tekton.dev/on-comment: ^/kfbuild\s+(all|odh\-workbench\-rstudio\-minimal\-cuda\-py311\-c9s|rstudio/c9s\-python\-3\.11)
     pipelinesascode.tekton.dev/on-cel-expression: |
       event == "pull_request" && target_branch
       == "main"
diff --git a/scripts/generate_pull_request_pipelineruns.py b/scripts/generate_pull_request_pipelineruns.py
