fix: improve message when /retest has nothing to retest

mathur07 · mathur07 · commit 7e13f6304176 · 2026-02-16T15:43:38.000-05:00
When using /retest and all pipelines have already succeeded, show:
"all PipelineRuns for this commit have already succeeded. Use /retest
&lt;pipeline-name&gt; to re-run a specific pipeline or /test to re-run all"

instead of the misleading "could not find any PipelineRun" message.

Fixes: SRVKP-10373
Signed-off-by: Shubham Mathur &lt;shumathu@redhat.com&gt;
diff --git a/pkg/matcher/annotation_matcher.go b/pkg/matcher/annotation_matcher.go
@@ -403,7 +403,11 @@ func MatchPipelinerunByAnnotation(ctx context.Context, logger *zap.SugaredLogger
 		if event.EventType == opscomments.RetestAllCommentEventType.String() ||
 			event.EventType == opscomments.OkToTestCommentEventType.String() {
 			logger.Debugf("MatchPipelinerunByAnnotation: filtering successful templates for event_type=%s", event.EventType)
-			return filterSuccessfulTemplates(ctx, logger, cs, event, repo, matchedPRs), nil
+			filtered := filterSuccessfulTemplates(ctx, logger, cs, event, repo, matchedPRs)
+			if len(filtered) == 0 {
+				return nil, fmt.Errorf("all PipelineRuns for this commit have already succeeded. Use /retest <pipeline-name> to re-run a specific pipeline or /test to re-run all")
+			}
+			return filtered, nil
 		}
 		return matchedPRs, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,11 @@ func MatchPipelinerunByAnnotation(ctx context.Context, logger *zap.SugaredLogger`
`403`	`403`	`if event.EventType == opscomments.RetestAllCommentEventType.String() \|\|`
`404`	`404`	`event.EventType == opscomments.OkToTestCommentEventType.String() {`
`405`	`405`	`logger.Debugf("MatchPipelinerunByAnnotation: filtering successful templates for event_type=%s", event.EventType)`
`406`		`- return filterSuccessfulTemplates(ctx, logger, cs, event, repo, matchedPRs), nil`
	`406`	`+ filtered := filterSuccessfulTemplates(ctx, logger, cs, event, repo, matchedPRs)`
	`407`	`+ if len(filtered) == 0 {`
	`408`	`+ return nil, fmt.Errorf("all PipelineRuns for this commit have already succeeded. Use /retest <pipeline-name> to re-run a specific pipeline or /test to re-run all")`
	`409`	`+ }`
	`410`	`+ return filtered, nil`
`407`	`411`	`}`
`408`	`412`	`return matchedPRs, nil`
`409`	`413`	`}`