remove stop_on_error

Author: martinlindhe

exec/model.go

@@ -18,7 +18,6 @@ type Context struct {
 	Cmds         []string
 	Pids         []int
 	Shell        string
-	StopOnError  bool
 }
 
 func (c *Context) Copy() Context {

exec/runner.go

@@ -102,15 +102,15 @@ func (sr SystemRunner) Run(execContext *Context) error {
 		return err
 	}
 	var exitCode int
-	execContext.Pids, exitCode, err = sr.runCmds(cmds, execContext.StopOnError)
+	execContext.Pids, exitCode, err = sr.runCmds(cmds)
 	if err != nil {
 		return RunError{Err: err, ExitCode: exitCode}
 	}
 
 	return nil
 }
 
-func (sr SystemRunner) runCmds(cmds []*exec.Cmd, stopOnError bool) (pids []int, exitCode int, err error) {
+func (sr SystemRunner) runCmds(cmds []*exec.Cmd) (pids []int, exitCode int, err error) {
 	for _, cmd := range cmds {
 		logrus.Debugf("will run cmd '%s'", cmd.String())
 		err := sr.SystemAPI.Run(cmd)
@@ -119,16 +119,11 @@ func (sr SystemRunner) runCmds(cmds []*exec.Cmd, stopOnError bool) (pids []int,
 		}
 
 		if exitError, ok := err.(*exec.ExitError); ok {
-			if stopOnError {
-				exitCode = exitError.ExitCode()
-			} else {
-				// Using stop_on_error: False, the overall exit code is the sum of all individual exit codes.
-				exitCode += exitError.ExitCode()
-			}
+			exitCode = exitError.ExitCode()
 		}
 
-		if stopOnError && err != nil {
-			logrus.Debugf("stopped execution of multi-command (stop-on-error=%v)", stopOnError)
+		if err != nil {
+			logrus.Debugf("stopped execution of multi-command")
 			return pids, exitCode, err
 		}
 		logrus.Debugf("execution success for '%s'", cmd.String())

exec/runner_test.go

@@ -135,7 +135,7 @@ func TestRunner(t *testing.T) {
 			execContext := tc.execContext
 			err := systemRunner.Run(execContext)
 			if tc.expectedErr != nil {
-				assert.Equal(t, err, tc.expectedErr)
+				assert.Equal(t, tc.expectedErr, err)
 				return
 			}
 

tasks/cmdRunTask.go

@@ -32,9 +32,6 @@ type CmdRunTask struct {
 
 	// aborts task execution if one task fails
 	AbortOnError bool
-
-	// aborts execution of a multi command task if a command fails
-	StopOnError bool
 }
 
 type CmdRunTaskBuilder struct {
@@ -87,8 +84,6 @@ func (crtb CmdRunTaskBuilder) Build(typeName, path string, ctx interface{}) (Tas
 			errs.Add(err)
 		case AbortOnErrorField:
 			t.AbortOnError = conv.ConvertToBool(val)
-		case StopOnErrorField:
-			t.StopOnError = conv.ConvertToBool(val)
 		}
 	}
 
@@ -150,7 +145,6 @@ func (crte *CmdRunTaskExecutor) Execute(ctx context.Context, task Task) Executio
 		Envs:         cmdRunTask.Envs,
 		Cmds:         cmdRunTask.GetNames(),
 		Shell:        cmdRunTask.Shell,
-		StopOnError:  cmdRunTask.StopOnError,
 	}
 
 	shouldNotBeExecutedReason, err := crte.shouldBeExecuted(execCtx, cmdRunTask)
@@ -168,8 +162,6 @@ func (crte *CmdRunTaskExecutor) Execute(ctx context.Context, task Task) Executio
 
 	start := time.Now()
 
-	// XXXX respect stop_on_error
-
 	err = crte.Runner.Run(execCtx)
 
 	execRes.Duration = time.Since(start)

tasks/fields.go

@@ -27,7 +27,6 @@ const (
 	ModeField         = "mode"
 	EncodingField     = "encoding"
 	AbortOnErrorField = "abort_on_error"
-	StopOnErrorField  = "stop_on_error"
 	Version           = "version"
 	Refresh           = "refresh"
 )