Skip to content

Commit 8734fd5

Browse files
committed
use CancelledRunFinally instead of Cancelled when cancelling pipeline
1 parent cd566c9 commit 8734fd5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

prow/cmd/pipeline/controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,10 @@ func (c *controller) cancelPipelineRun(pContext string, pipeline *pipelinev1beta
331331
if err != nil {
332332
return err
333333
}
334-
if pipeline.Spec.Status == pipelinev1beta1.PipelineRunSpecStatusCancelled {
334+
if pipeline.Spec.Status == pipelinev1beta1.PipelineRunSpecStatusCancelledRunFinally {
335335
return nil
336336
}
337-
pipeline.Spec.Status = pipelinev1beta1.PipelineRunSpecStatusCancelled
337+
pipeline.Spec.Status = pipelinev1beta1.PipelineRunSpecStatusCancelledRunFinally
338338
_, err = p.client.TektonV1beta1().PipelineRuns(pipeline.Namespace).Update(context.TODO(), pipeline, metav1.UpdateOptions{})
339339
return err
340340
}
@@ -504,7 +504,7 @@ func reconcile(c reconciler, key string) error {
504504
logrus.Infof("Observed finished: %s", key)
505505
return nil
506506
case cancelledState(pj.Status.State):
507-
if p != nil && p.Spec.Status != pipelinev1beta1.PipelineRunSpecStatusCancelled {
507+
if p != nil && p.Spec.Status != pipelinev1beta1.PipelineRunSpecStatusCancelledRunFinally {
508508
if err = c.cancelPipelineRun(ctx, p); err != nil {
509509
return fmt.Errorf("failed to cancel pipelineRun: %w", err)
510510
}

prow/cmd/pipeline/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func (r *fakeReconciler) pipelineID(pj prowjobv1.ProwJob) (string, string, error
154154
}
155155

156156
func (r *fakeReconciler) cancelPipelineRun(context string, pr *pipelinev1beta1.PipelineRun) error {
157-
pr.Spec.Status = pipelinev1beta1.PipelineRunSpecStatusCancelled
157+
pr.Spec.Status = pipelinev1beta1.PipelineRunSpecStatusCancelledRunFinally
158158
return nil
159159
}
160160

0 commit comments

Comments
 (0)