Skip to content
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

Jump to bottom

fix(api): on retryOnlyFailedJob, retrieve build variable #6452

Merged
merged 1 commit into from
Feb 13, 2023
Merged

fix(api): on retryOnlyFailedJob, retrieve build variable #6452

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
13 changes: 13 additions & 0 deletions engine/api/workflow/process_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,19 @@ func processNode(ctx context.Context, db gorpmapper.SqlExecutorWithTx, store cac
nr.BuildParameters = sdk.ParametersFromMap(sdk.ParametersMapMerge(mapBuildParams, mapParentParams))
}

// If we rerun only failed job, retrieve cds.build variables from previous jobs
if nr.Manual != nil && nr.Manual.OnlyFailedJobs {
previousNodeRun, err := checkRunOnlyFailedJobs(wr, nr)
if err != nil {
return nil, false, err
}
for _, bp := range previousNodeRun.BuildParameters {
if strings.HasPrefix(bp.Name, "cds.build.") {
nr.BuildParameters = append(nr.BuildParameters, bp)
}
}
}

isRoot := n.ID == wr.Workflow.WorkflowData.Node.ID

// GIT PARAMS
Expand Down
24 changes: 19 additions & 5 deletions engine/api/workflow_run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2995,6 +2995,14 @@ func Test_postWorkflowRunHandlerRestartOnlyFailed(t *testing.T) {
}
assert.NoError(t, workflow.UpdateNodeRun(db, nr))

nr.BuildParameters = append(nr.BuildParameters, sdk.Parameter{
Name: "cds.build.image",
Type: "string",
Value: "myimage",
})
require.NoError(t, workflow.UpdateNodeRunBuildParameters(db, nr.ID, nr.BuildParameters))
wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0] = *nr

opts = sdk.WorkflowRunPostHandlerOption{
Manual: &sdk.WorkflowNodeRunManual{
OnlyFailedJobs: true,
Expand All @@ -3008,11 +3016,17 @@ func Test_postWorkflowRunHandlerRestartOnlyFailed(t *testing.T) {

wrr, _ = workflow.LoadRun(context.TODO(), db, proj2.Key, w1.Name, 1, workflow.LoadRunOptions{})

assert.Equal(t, sdk.StatusBuilding, wrr.Status)
assert.Equal(t, firstJobEnd.Unix(), wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[0].Start.Unix())
assert.NotEqual(t, firstJobEnd, wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[1].Start)
assert.Equal(t, sdk.StatusSuccess, wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[0].Status)
assert.Equal(t, sdk.StatusWaiting, wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[1].Status)
require.Equal(t, sdk.StatusBuilding, wrr.Status)
require.Equal(t, firstJobEnd.Unix(), wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[0].Start.Unix())
require.NotEqual(t, firstJobEnd, wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[1].Start)
require.Equal(t, sdk.StatusSuccess, wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[0].Status)
require.Equal(t, sdk.StatusWaiting, wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].Stages[0].RunJobs[1].Status)

mapParams := sdk.ParametersToMap(wrr.WorkflowNodeRuns[wrr.Workflow.WorkflowData.Node.ID][0].BuildParameters)
p, has := mapParams["cds.build.image"]
require.True(t, has)
require.Equal(t, p, "myimage")

}

func Test_CheckRegionDuringInitWorkflow(t *testing.T) {
Expand Down