Merge pull request agola-io#115 from sgotti/runservice_save_run_exits…

…tatus runservice: save step exitstatus in run.
tulliobotti64 · Sep 17, 2019 · 15b9218 · 15b9218
2 parents efa71b5 + ff38096
commit 15b9218
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/internal/services/executor/executor.go b/internal/services/executor/executor.go
@@ -983,8 +983,10 @@ func (e *Executor) executeTaskSteps(ctx context.Context, rt *runningTask, pod dr
 			serr = errors.Errorf("failed to execute step %s: %w", util.Dump(step), err)
 		} else if exitCode != 0 {
 			rt.et.Status.Steps[i].Phase = types.ExecutorTaskPhaseFailed
-			rt.et.Status.Steps[i].ExitCode = exitCode
+			rt.et.Status.Steps[i].ExitStatus = util.IntP(exitCode)
 			serr = errors.Errorf("step %q failed with exitcode %d", stepName, exitCode)
+		} else if exitCode == 0 {
+			rt.et.Status.Steps[i].ExitStatus = util.IntP(exitCode)
 		}
 
 		if err := e.sendExecutorTaskStatus(ctx, rt.et); err != nil {

diff --git a/internal/services/runservice/scheduler.go b/internal/services/runservice/scheduler.go
@@ -688,6 +688,7 @@ func (s *Runservice) updateRunTaskStatus(ctx context.Context, et *types.Executor
 
 	for i, s := range et.Status.Steps {
 		rt.Steps[i].Phase = s.Phase
+		rt.Steps[i].ExitStatus = s.ExitStatus
 		rt.Steps[i].StartTime = s.StartTime
 		rt.Steps[i].EndTime = s.EndTime
 	}

diff --git a/services/runservice/types/types.go b/services/runservice/types/types.go
@@ -277,6 +277,8 @@ type RunTaskStep struct {
 	// one logphase for every task step
 	LogPhase RunTaskFetchPhase `json:"log_phase,omitempty"`
 
+	ExitStatus *int `json:"exit_status"`
+
 	StartTime *time.Time `json:"start_time,omitempty"`
 	EndTime   *time.Time `json:"end_time,omitempty"`
 }
@@ -532,7 +534,7 @@ type ExecutorTaskStepStatus struct {
 	StartTime *time.Time `json:"start_time,omitempty"`
 	EndTime   *time.Time `json:"end_time,omitempty"`
 
-	ExitCode int `json:"exit_code,omitempty"`
+	ExitStatus *int `json:"exit_status,omitempty"`
 }
 
 type Container struct {