fix: overall status judgement when multiple stage errors (#1281)

caicloud · Sep 11, 2019 · cb65dec · cb65dec
1 parent 9769fe4
commit cb65dec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/workflow/workflowrun/operator.go b/pkg/workflow/workflowrun/operator.go
@@ -279,12 +279,12 @@ func (o *operator) OverallStatus() (*v1alpha1.Status, error) {
 		case v1alpha1.StatusWaiting:
 			waiting = true
 		case v1alpha1.StatusFailed:
-			err = !IsTrivial(o.wf, stage)
+			err = err || !IsTrivial(o.wf, stage)
 		case v1alpha1.StatusPending:
 			pending = true
 		case v1alpha1.StatusSucceeded:
 		case v1alpha1.StatusCancelled:
-			err = !IsTrivial(o.wf, stage)
+			err = err || !IsTrivial(o.wf, stage)
 		default:
 			log.WithField("stg", stage).
 				WithField("status", status.Status.Phase).