Merge pull request #514 from jenkins-x-plugins/prevent-hang

fix: prevent jx-build-controller from hanging

Author: jenkins-x-bot

cmd/docs/main.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

cmd/docs/md_docs.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,

pkg/cmd/effective/effective.go

@@ -1,7 +1,6 @@
 package effective
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -322,7 +321,7 @@ func (o *Options) displayPipeline(path, name string, pipeline *tektonv1beta1.Pip
 			fileName = "jx-pipeline"
 		}
 		tmpFileName := fileName + "-" + strings.ReplaceAll(name, string(os.PathSeparator), "-") + "-*.yaml"
-		tmpFile, err := ioutil.TempFile("", tmpFileName)
+		tmpFile, err := os.CreateTemp("", tmpFileName)
 		if err != nil {
 			return errors.Wrapf(err, "failed to create temp file")
 		}

pkg/pipelines/processor/inliner.go

@@ -50,7 +50,7 @@ func (p *inliner) processPipelineSpec(ps *v1beta1.PipelineSpec, path string) (bo
 	return ProcessPipelineSpec(ps, path, p.processTaskSpec)
 }
 
-//nolint
+// nolint
 func (p *inliner) processTaskSpec(ts *v1beta1.TaskSpec, path, name string) (bool, error) {
 	templateImage := ""
 	if ts.StepTemplate != nil {

pkg/tektonlog/tektonlog.go

@@ -215,6 +215,7 @@ type stageTime struct {
 	task      string
 	skipped   bool
 	podExists bool
+	completed bool
 }
 
 func (t *TektonLogger) getRunningBuildLogs(ctx context.Context, pa *v1.PipelineActivity, pipelineRuns []*tektonapis.PipelineRun, buildName string, out chan<- LogLine) error {
@@ -259,7 +260,7 @@ func (t *TektonLogger) getRunningBuildLogs(ctx context.Context, pa *v1.PipelineA
 					completedStages[podName] = true
 				}
 
-			} else if stage.skipped {
+			} else if stage.skipped || stage.completed {
 				completedStages[stageName] = true
 				log.Logger().Infof("pod is skipped/failed for task: %s", stageName)
 			}
@@ -273,7 +274,7 @@ func (t *TektonLogger) getRunningBuildLogs(ctx context.Context, pa *v1.PipelineA
 		if len(completedStages) == len(stages) {
 			loggedAllRunsForActivity = true
 		} else {
-			log.Logger().Debug("let's a wait second for next pod/task to start")
+			log.Logger().Debug("let's wait a second for next pod/task to start")
 			time.Sleep(time.Second)
 		}
 	}
@@ -332,12 +333,13 @@ func (t *TektonLogger) collectStages(ctx context.Context, pipelineRuns []*tekton
 
 func findExecutedOrSkippedStagesStage(taskName string, pr *tektonapis.PipelineRun) stageTime {
 	for _, taskStatus := range pr.Status.TaskRuns {
-		if taskName == taskStatus.PipelineTaskName && taskStatus.Status.PodName != "" {
+		if taskName == taskStatus.PipelineTaskName {
 			return stageTime{
 				podName:   taskStatus.Status.PodName,
 				startTime: taskStatus.Status.StartTime,
 				task:      taskName,
-				podExists: true,
+				podExists: taskStatus.Status.PodName != "",
+				completed: taskStatus.Status.CompletionTime != nil,
 			}
 		}
 	}