Merge branch 'main' into rhtap/references/main

konflux-ci · Oct 26, 2023 · 2f7aeb0 · 2f7aeb0
2 parents b3c06bf + 3f0d326
commit 2f7aeb0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 197 deletions.
diff --git a/.tekton/controller-pull-request.yaml b/.tekton/controller-pull-request.yaml
diff --git a/.tekton/controller-push.yaml b/.tekton/controller-push.yaml
diff --git a/.tekton/oauth-pull-request.yaml b/.tekton/oauth-pull-request.yaml
diff --git a/.tekton/oauth-push.yaml b/.tekton/oauth-push.yaml
diff --git a/.tekton/spi-oauth-pull-request.yaml b/.tekton/spi-oauth-pull-request.yaml
@@ -7,9 +7,8 @@ metadata:
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./***".pathChanged() || ".tekton/spi-oauth-pull-request.yaml".pathChanged()
-      || "oauth.Dockerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-event: '[pull_request]'
+    pipelinesascode.tekton.dev/on-target-branch: '[main]'
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: spi

diff --git a/.tekton/spi-oauth-push.yaml b/.tekton/spi-oauth-push.yaml
@@ -6,8 +6,8 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main"
+    pipelinesascode.tekton.dev/on-event: '[push]'
+    pipelinesascode.tekton.dev/on-target-branch: '[main]'
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: spi

diff --git a/.tekton/spi-operator-pull-request.yaml b/.tekton/spi-operator-pull-request.yaml
@@ -7,9 +7,8 @@ metadata:
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./***".pathChanged() || ".tekton/spi-operator-pull-request.yaml".pathChanged()
-      || "Dockerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-event: '[pull_request]'
+    pipelinesascode.tekton.dev/on-target-branch: '[main]'
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: spi

diff --git a/.tekton/spi-operator-push.yaml b/.tekton/spi-operator-push.yaml
@@ -6,8 +6,8 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main"
+    pipelinesascode.tekton.dev/on-event: '[push]'
+    pipelinesascode.tekton.dev/on-target-branch: '[main]'
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: spi