8000 fix(api): allow running auto a join if parent if failing (#4497) · ovh/cds@f6331ec · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit f6331ec

Browse files
authored
fix(api): allow running auto a join if parent if failing (#4497)
1 parent 8be8562 commit f6331ec

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

engine/api/workflow/process_start.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,23 +113,17 @@ func processAllJoins(ctx context.Context, db gorp.SqlExecutor, store cache.Store
113113
var ok = true
114114
nodeRunIDs := []int64{}
115115
sourcesParams := map[string]string{}
116-
sourcesFail := 0
117116
for _, nodeRun := range sources {
118117
if nodeRun == nil {
119118
ok = false
120119
break
121120
}
122121

123-
if !sdk.StatusIsTerminated(nodeRun.Status) || nodeRun.Status == sdk.StatusNeverBuilt.String() || nodeRun.Status == sdk.StatusFail.String() || nodeRun.Status == sdk.StatusStopped.String() {
124-
//One of the sources have not been completed
122+
if !sdk.StatusIsTerminated(nodeRun.Status) || nodeRun.Status == sdk.StatusNeverBuilt.String() || nodeRun.Status == sdk.StatusStopped.String() {
125123
ok = false
126124
break
127125
}
128126

129-
if nodeRun.Status == sdk.StatusFail.String() {
130-
sourcesFail++
131-
}
132-
133127
nodeRunIDs = append(nodeRunIDs, nodeRun.ID)
134128
//Merge build parameters from all sources
135129
sourcesParams = sdk.ParametersMapMerge(sourcesParams, sdk.ParametersToMap(nodeRun.BuildParameters))

0 commit comments

Comments
 (0)
0