fix: ensure cancel-in-progress targets PR PipelineRuns only

- Add event-type label to selector for PR-close cancellations
- Prevent accidental cancellation of push-triggered PipelineRuns
  that share a PR number
- Extend tests to cover mixed push/PR scenarios after merge

Signed-off-by: Zaki Shaikh <zashaikh@redhat.com>

Author: zakisk

pkg/pipelineascode/cancel_pipelineruns.go

@@ -42,6 +42,7 @@ func (p *PacRun) cancelAllInProgressBelongingToClosedPullRequest(ctx context.Con
 	// First, build the label selector based on the URLRepository and PullRequest fields,
 	// followed by applying filtering logic for the 'cancel-in-progress' annotation.
 	labelSelector := getLabelSelector(labelsMap, operator)
+	labelSelector += fmt.Sprintf(",%s in (pull_request, Merge_Request, %s)", keys.EventType, opscomments.AnyOpsKubeLabelInSelector())
 
 	if cancelInProgress == "true" {
 		// When the 'cancel-in-progress' setting is enabled globally via the Pipelines-as-Code ConfigMap,

pkg/pipelineascode/cancel_pipelineruns_test.go

@@ -1316,6 +1316,34 @@ func TestCancelAllInProgressBelongingToClosedPullRequest(t *testing.T) {
 			},
 			cancelledPipelineRuns: map[string]bool{},
 		},
+		// this can happen when a pull request is merged and a new push is made to the branch
+		// so PaC assign the merged pull request number to the push PipelineRun
+		{
+			name: "do not cancel push-triggered PipelineRuns on PR close",
+			event: &info.Event{
+				Repository:        "foo",
+				PullRequestNumber: pullReqNumber,
+				TriggerTarget:     "push",
+			},
+			repo: fooRepo,
+			pipelineRuns: []*pipelinev1.PipelineRun{
+				{
+					Spec: pipelinev1.PipelineRunSpec{},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "pr-foo-1",
+						Namespace: "foo",
+						Labels: map[string]string{
+							keys.OriginalPRName: "pr-foo",
+							keys.URLRepository:  formatting.CleanValueKubernetes("foo"),
+							keys.PullRequest:    strconv.Itoa(pullReqNumber),
+							keys.EventType:      string(triggertype.Push),
+							keys.SHA:            formatting.CleanValueKubernetes("foosha"),
+						},
+					},
+				},
+			},
+			cancelledPipelineRuns: map[string]bool{},
+		},
 		{
 			name: "exclude PipelineRun having cancel-in-progress set to false when global setting is true",
 			event: &info.Event{