reflect state of started pipeline/task when using --showlog

- this change fixes an issue where using --showlog with tkn start pipeline/task does not return a non-zero value when created taskrun/pipelinerun fails. - refer #1820 Signed-off-by: Avinal Kumar <[email protected]>
tektoncd · Sep 6, 2023 · e30943e · e30943e
1 parent a328616
commit e30943e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/pkg/cmd/pipeline/start.go b/pkg/cmd/pipeline/start.go
@@ -24,6 +24,8 @@ import (
 	"strings"
 	"time"
 
+	"knative.dev/pkg/apis"
+
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/AlecAivazis/survey/v2/terminal"
 	"github.com/spf13/cobra"
@@ -414,7 +416,22 @@ func (opt *startOptions) startPipeline(pipelineStart *v1beta1.Pipeline) error {
 		Params:          opt.cliparams,
 		AllSteps:        false,
 	}
-	return prcmd.Run(runLogOpts)
+	if err = prcmd.Run(runLogOpts); err != nil {
+		return err
+	}
+
+	// Fetch the PipelineRun to get the PipelineRun status
+	prLatest, err := pipelinerun.GetPipelineRun(pipelineRunGroupResource, cs, prCreated.Name, prCreated.Namespace)
+	if err != nil {
+		return err
+	}
+
+	// If PipelineRun status is not Succeeded, print the PipelineRun status
+	if prLatest.Status.GetCondition(apis.ConditionSucceeded).IsFalse() {
+		return fmt.Errorf("pipelinerun %s did not succeed", prLatest.Name)
+	}
+
+	return nil
 }
 
 func (opt *startOptions) getInput(pipeline *v1beta1.Pipeline) error {

diff --git a/pkg/cmd/task/start.go b/pkg/cmd/task/start.go
@@ -425,7 +425,23 @@ func startTask(opt startOptions, args []string) error {
 		Params:      opt.cliparams,
 		AllSteps:    false,
 	}
-	return taskrun.Run(runLogOpts)
+
+	if err := taskrun.Run(runLogOpts); err != nil {
+		return err
+	}
+
+	// fetch the taskrun again to get the latest status
+	trLatest, err := traction.GetTaskRun(taskrunGroupResource, cs, trCreated.Name, trCreated.Namespace)
+	if err != nil {
+		return err
+	}
+
+	// check if the created taskrun succeed or not
+	if !trLatest.IsSuccessful() {
+		return fmt.Errorf("taskRun %s did not succeed", trCreated.Name)
+	}
+
+	return nil
 }
 
 func printTaskRun(output string, s *cli.Stream, tr interface{}) error {