Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions pkg/reconciler/finalizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,47 @@ func (r *Reconciler) FinalizeKind(ctx context.Context, pr *tektonv1.PipelineRun)
return nil
}
}

if state == kubeinteraction.StateFailed {
repoName, ok := pr.GetAnnotations()[keys.Repository]
if !ok {
return nil
}
repo, err := r.repoLister.Repositories(pr.Namespace).Get(repoName)
if errors.IsNotFound(err) {
return nil
}
if err != nil {
return err
}

if err := r.retryFinalStatusUpdate(ctx, repo, pr); err != nil {
logger.Errorf("failed to retry final status update on finalize: %v", err)
}
}

return nil
}

func (r *Reconciler) retryFinalStatusUpdate(ctx context.Context, repo *v1alpha1.Repository, pr *tektonv1.PipelineRun) error {
logger := logging.FromContext(ctx)
pacInfo := r.run.Info.GetPacOpts()

detectedProvider, event, err := r.initGitProviderClient(ctx, logger, repo, pr)
if err != nil {
return err
}

if r.run.Clients.Log == nil {
r.run.Clients.Log = logger
}

_, _, err = r.postFinalStatus(ctx, logger, &pacInfo, detectedProvider, event, pr)
if err != nil {
return fmt.Errorf("failed to post final status on finalize: %w", err)
}

logger.Infof("successfully retried final status update for pipelineRun %s/%s", pr.GetNamespace(), pr.GetName())
return nil
}

Expand Down
26 changes: 22 additions & 4 deletions pkg/reconciler/finalizer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/keys"
"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
"github.com/openshift-pipelines/pipelines-as-code/pkg/consoleui"
"github.com/openshift-pipelines/pipelines-as-code/pkg/events"
"github.com/openshift-pipelines/pipelines-as-code/pkg/kubeinteraction"
"github.com/openshift-pipelines/pipelines-as-code/pkg/params"
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/clients"
Expand All @@ -20,7 +21,9 @@ import (
"go.uber.org/zap"
zapobserver "go.uber.org/zap/zaptest/observer"
"gotest.tools/v3/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"knative.dev/pkg/apis"
"knative.dev/pkg/logging"
rtesting "knative.dev/pkg/reconciler/testing"
)
Expand Down Expand Up @@ -126,6 +129,18 @@ func TestReconcilerFinalizeKind(t *testing.T) {
getTestPR("pr3", kubeinteraction.StateQueued),
},
},
{
name: "failed state retries final status",
pipelinerun: func() *tektonv1.PipelineRun {
pr := getTestPR("pr1", kubeinteraction.StateFailed)
pr.Status.Conditions = append(pr.Status.Conditions, apis.Condition{
Type: apis.ConditionSucceeded,
Status: corev1.ConditionFalse,
Reason: tektonv1.PipelineRunReasonFailed.String(),
})
return pr
}(),
},
}

for _, tt := range tests {
Expand All @@ -134,6 +149,7 @@ func TestReconcilerFinalizeKind(t *testing.T) {
ctx = logging.WithLogger(ctx, fakelogger)
testData := testclient.Data{
Repositories: []*v1alpha1.Repository{finalizeTestRepo},
PipelineRuns: []*tektonv1.PipelineRun{tt.pipelinerun},
}
if tt.skipAddingRepo {
testData.Repositories = []*v1alpha1.Repository{}
Expand All @@ -148,6 +164,7 @@ func TestReconcilerFinalizeKind(t *testing.T) {
cs := &params.Run{
Clients: clients.Clients{
PipelineAsCode: stdata.PipelineAsCode,
Tekton: stdata.Pipeline,
Log: fakelogger,
},
Info: info.Info{
Expand All @@ -158,10 +175,11 @@ func TestReconcilerFinalizeKind(t *testing.T) {
}
cs.Clients.SetConsoleUI(consoleui.FallBackConsole{})
r := Reconciler{
repoLister: informers.Repository.Lister(),
qm: queuepkg.NewManager(fakelogger),
run: cs,
kinteract: kinterfaceTest,
repoLister: informers.Repository.Lister(),
qm: queuepkg.NewManager(fakelogger),
run: cs,
kinteract: kinterfaceTest,
eventEmitter: events.NewEventEmitter(stdata.Kube, fakelogger),
}

if len(tt.addToQueue) != 0 {
Expand Down
Loading