run config: add tty option for run steps

agola-io · Oct 23, 2019 · 393c611 · 393c611
1 parent a0450a5
commit 393c611
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -165,6 +165,7 @@ type RunStep struct {
 	Environment map[string]Value `json:"environment,omitempty"`
 	WorkingDir  string           `json:"working_dir"`
 	Shell       string           `json:"shell"`
+	Tty         *bool            `json:"tty"`
 }
 
 type SaveToWorkspaceStep struct {
@@ -890,7 +891,11 @@ func checkConfig(config *Config) error {
 						}
 						step.Name = step.Command[:len]
 					}
-
+					// if tty is omitted its default is true
+					if step.Tty == nil {
+						step.Tty = new(bool)
+						*step.Tty = true
+					}
 				case *SaveCacheStep:
 					for _, content := range step.Contents {
 						if len(content.Paths) == 0 {

diff --git a/internal/runconfig/runconfig.go b/internal/runconfig/runconfig.go
@@ -135,6 +135,7 @@ fi
 		rs.Environment = env
 		rs.WorkingDir = cs.WorkingDir
 		rs.Shell = cs.Shell
+		rs.Tty = *cs.Tty
 		return rs
 
 	case *config.SaveToWorkspaceStep:

diff --git a/internal/services/executor/executor.go b/internal/services/executor/executor.go
@@ -171,7 +171,7 @@ func (e *Executor) doRunStep(ctx context.Context, s *types.RunStep, t *types.Exe
 		AttachStdin: true,
 		Stdout:      outf,
 		Stderr:      outf,
-		Tty:         true,
+		Tty:         s.Tty,
 	}
 
 	ce, err := pod.Exec(ctx, execConfig)

diff --git a/services/runservice/types/types.go b/services/runservice/types/types.go
@@ -415,6 +415,7 @@ type RunStep struct {
 	Environment map[string]string `json:"environment,omitempty"`
 	WorkingDir  string            `json:"working_dir,omitempty"`
 	Shell       string            `json:"shell,omitempty"`
+	Tty         bool              `json:"tty,omitempty"`
 }
 
 type SaveContent struct {