Skip to content

fix: fix for failure to trigger cd set on auto after pre-cd is success which is also on auto which got triggered after ci #6361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2025
Merged

fix: fix for failure to trigger cd set on auto after pre-cd is success which is also on auto which got triggered after ci #6361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions pkg/eventProcessor/in/WorkflowEventProcessorService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
return
}
wfr.IsArtifactUploaded = cdStageCompleteEvent.IsArtifactUploaded
// currently, CD_STAGE_COMPLETE_TOPIC is published from ci-runner only for pre/post CD success or failure events.
// no other wfr status are sent other than these two.
// a check is in place for all terminal states to ensure future compatibility.
if !slices.Contains(cdWorkflowModelBean.WfrTerminalStatusList, wfr.Status) {
impl.logger.Debugw("event received from ci runner, updating workflow runner status as succeeded", "savedWorkflowRunnerId", wfr.Id, "oldStatus", wfr.Status, "podStatus", wfr.PodStatus)
if cdStageCompleteEvent.IsFailed {
Expand All @@ -182,18 +185,17 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
impl.logger.Errorw("update cd-wf-runner failed for id ", "cdWfrId", wfr.Id, "err", err)
return
}

triggerContext := triggerBean.TriggerContext{
ReferenceId: pointer.String(msg.MsgId),
}
impl.handleCDStageCompleteEvent(triggerContext, cdStageCompleteEvent, wfr)
} else {
err = impl.cdWorkflowRunnerService.UpdateIsArtifactUploaded(wfr.Id, cdStageCompleteEvent.IsArtifactUploaded)
if err != nil {
impl.logger.Errorw("error in updating isArtifactUploaded", "cdWfrId", wfr.Id, "err", err)
return
}
}
triggerContext := triggerBean.TriggerContext{
ReferenceId: pointer.String(msg.MsgId),
}
impl.handleCDStageCompleteEvent(triggerContext, cdStageCompleteEvent, wfr)
}

// add required logging here
Expand Down
1 change: 1 addition & 0 deletions pkg/pipeline/CdHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,7 @@ func (impl *CdHandlerImpl) converterWFR(wfr pipelineConfig.CdWorkflowRunner) pip
workflow.TargetPlatforms = utils.ConvertTargetPlatformStringToObject(wfr.CdWorkflow.CiArtifact.TargetPlatforms)
workflow.PipelineId = wfr.CdWorkflow.PipelineId
workflow.CiArtifactId = wfr.CdWorkflow.CiArtifactId
// TODO: FIXME :- if wfr status is terminal then only migrate isArtifactUploaded flag.
isArtifactUploaded, isMigrationRequired := wfr.GetIsArtifactUploaded()
if isMigrationRequired {
// Migrate isArtifactUploaded. For old records, set isArtifactUploaded -> Uploaded
Expand Down
Loading