fix 01

Signed-off-by: Sean Conroy <sconroy@redhat.com>

Author: seanconroy2021

api/v1alpha1/release_types.go

@@ -475,6 +475,10 @@ func (r *Release) MarkCurrentManagedPipelineAttemptProcessed() {
 	}
 
 	attempt := r.GetCurrentManagedPipelineAttempt()
+	if attempt == nil {
+		return
+	}
+
 	attempt.Status = AttemptSucceededReason
 	attempt.CompletionTime = &metav1.Time{Time: time.Now()}
 
@@ -728,6 +732,10 @@ func (r *Release) MarkCurrentManagedPipelineAttemptFailed(message, failureReason
 	}
 
 	attempt := r.GetCurrentManagedPipelineAttempt()
+	if attempt == nil {
+		return
+	}
+
 	attempt.Status = AttemptFailedReason
 	attempt.CompletionTime = &metav1.Time{Time: time.Now()}
 	attempt.FailureReason = failureReason

controllers/release/adapter.go

@@ -548,7 +548,12 @@ func (a *adapter) EnsureManagedPipelineIsProcessed() (controller.OperationResult
 		return controller.RequeueOnErrorOrContinue(a.client.Status().Patch(a.ctx, a.release, patch))
 	}
 
-	pipelineRun, err := a.loader.GetReleasePipelineRun(a.ctx, a.client, a.release, metadata.ManagedPipelineType)
+	// Let the completion operation handle retry when the current attempt has failed
+	if a.release.IsCurrentManagedPipelineAttemptFailed() {
+		return controller.ContinueProcessing()
+	}
+
+	pipelineRun, err := a.loader.GetReleasePipelineRunAttempt(a.ctx, a.client, a.release, a.release.GetManagedPipelineRetryCount())
 	if err != nil && !errors.IsNotFound(err) {
 		return controller.RequeueWithError(err)
 	}

controllers/release/adapter_test.go

@@ -1151,7 +1151,7 @@ var _ = Describe("Release adapter", Ordered, func() {
 		It("should requeue with error if fetching the Release managed pipeline returns an error besides not found", func() {
 			adapter.ctx = toolkit.GetMockedContext(ctx, []toolkit.MockData{
 				{
-					ContextKey: loader.ReleasePipelineRunContextKey,
+					ContextKey: loader.ReleasePipelineRunAttemptContextKey,
 					Err:        fmt.Errorf("some error"),
 				},
 			})
@@ -1224,7 +1224,7 @@ var _ = Describe("Release adapter", Ordered, func() {
 		It("should continue if the PipelineRun exists and the release managed pipeline processing has started", func() {
 			adapter.ctx = toolkit.GetMockedContext(ctx, []toolkit.MockData{
 				{
-					ContextKey: loader.ReleasePipelineRunContextKey,
+					ContextKey: loader.ReleasePipelineRunAttemptContextKey,
 					Resource: &tektonv1.PipelineRun{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      "pipeline-run",
@@ -1249,7 +1249,7 @@ var _ = Describe("Release adapter", Ordered, func() {
 		It("should register the processing data if the PipelineRun already exists", func() {
 			adapter.ctx = toolkit.GetMockedContext(ctx, []toolkit.MockData{
 				{
-					ContextKey: loader.ReleasePipelineRunContextKey,
+					ContextKey: loader.ReleasePipelineRunAttemptContextKey,
 					Resource: &tektonv1.PipelineRun{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      "pipeline-run",