Fix selecting non completed pipelineRun on cleanup

We were selecting the pipelineRun that did not have the StateCompleted
label and this would seriously bug the concurrency manager.

This fixes it.

Author: chmouel

pkg/kubeinteraction/cleanups.go

@@ -20,8 +20,10 @@ func (k Interaction) CleanupPipelines(ctx context.Context, logger *zap.SugaredLo
 	}
 
 	// Select PR by repository and by its true pipelineRun name (not auto generated one)
-	labelSelector := fmt.Sprintf("%s=%s,%s=%s",
-		keys.Repository, formatting.CleanValueKubernetes(repo.GetName()), keys.OriginalPRName, formatting.CleanValueKubernetes(pr.GetLabels()[keys.OriginalPRName]))
+	labelSelector := fmt.Sprintf("%s=%s,%s=%s,%s=%s",
+		keys.Repository, formatting.CleanValueKubernetes(repo.GetName()), keys.OriginalPRName,
+		formatting.CleanValueKubernetes(pr.GetLabels()[keys.OriginalPRName]),
+		keys.State, StateCompleted)
 	logger.Infof("selecting pipelineruns by labels \"%s\" for deletion", labelSelector)
 
 	pruns, err := k.Run.Clients.Tekton.TektonV1().PipelineRuns(repo.GetNamespace()).List(ctx,

pkg/kubeinteraction/cleanups_test.go

@@ -27,6 +27,7 @@ func TestCleanupPipelines(t *testing.T) {
 	cleanupLabels := map[string]string{
 		keys.OriginalPRName: cleanupPRName,
 		keys.Repository:     cleanupRepoName,
+		keys.State:          StateCompleted,
 	}
 	// copy of cleanupLabels to be used in annotations
 	cleanupAnnotations := maps.Clone(cleanupLabels)

pkg/reconciler/cleanup_test.go

@@ -30,6 +30,7 @@ func TestCleanupPipelineRuns(t *testing.T) {
 	cleanupLabels := map[string]string{
 		keys.OriginalPRName: cleanupPRName,
 		keys.Repository:     cleanupRepoName,
+		keys.State:          kubeinteraction.StateCompleted,
 	}
 
 	cleanupAnnotation := map[string]string{