Merge pull request #197 from go-atomci/feat-sync-publishjob

🦄 refactor: when job 404, add default value
go-atomci · Jun 26, 2023 · 6582936 · 6582936
2 parents 229d8ab + cb1ac0d
commit 6582936
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/internal/core/publish/uitls.go b/internal/core/publish/uitls.go
@@ -63,7 +63,7 @@ func (pm *PublishManager) getPublishItemCanEnableOperations(item *models.Publish
 		operations.BackTo = false
 	case models.Running, models.Pending:
 		operations = getOperationCanEnableByStepStatus(item.StepType, item.Status, operations)
-	case models.Failed:
+	case models.Failed, models.UnKnown:
 		operations = getOperationCanEnableByStepStatus(item.StepType, item.Status, operations)
 	case models.Success:
 		nextStep, err := pm.pipelineHandler.GetNextStepTypeByStageID(item.LastPipelineInstanceID, item.StageID, item.StepIndex)

diff --git a/internal/cronjob/publishjob.go b/internal/cronjob/publishjob.go
@@ -18,13 +18,15 @@ package cronjob
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/go-atomci/atomci/internal/core/pipelinemgr"
 	"github.com/go-atomci/atomci/internal/dao"
 	"github.com/go-atomci/atomci/internal/middleware/log"
 	"github.com/go-atomci/atomci/internal/models"
 	"github.com/go-atomci/atomci/utils"
+	"github.com/go-atomci/workflow"
 
 	"github.com/go-atomci/workflow/jenkins"
 )
@@ -61,7 +63,7 @@ func syncAllPublishJobStatus() {
 }
 
 func getRunningPublishJob(newPublishJob *dao.PublishJobModel) []*models.PublishJob {
-	publishJobs, err := newPublishJob.GetPublishJobsByFilter([]string{models.StatusRunning, models.StatusUnknown, models.StatusInit}, []string{models.JobTypeBuild, models.JobTypeDeploy})
+	publishJobs, err := newPublishJob.GetPublishJobsByFilter([]string{models.StatusRunning, models.StatusInit}, []string{models.JobTypeBuild, models.JobTypeDeploy})
 	if err != nil {
 		log.Log.Error("when sync publish job, get publish jobs occur error: %s", err.Error())
 		return nil
@@ -128,7 +130,16 @@ func getPipelineJobStatus(jobName string, job *models.PublishJob, pipeline *pipe
 
 	jobDetail, err := workFlowProvider.GetJobInfo(job.RunID)
 	if err != nil {
-		return nil, 0, err
+		if strings.Contains(err.Error(), "404 not found") {
+			// when job 404/ set jobDetail default value.
+			jobDetail = &workflow.JobInfo{
+				Result:         models.StatusUnknown,
+				DurationMillis: 0,
+				Stages:         []workflow.Stage{},
+			}
+		} else {
+			return nil, 0, err
+		}
 	}
 
 	// get job result and execute time
@@ -171,7 +182,7 @@ func getPipelineJobStatus(jobName string, job *models.PublishJob, pipeline *pipe
 	case "IN_PROGRESS":
 		jobStatus = models.StatusRunning
 	default:
-		log.Log.Error("job's status is undesired value: %v, reset job status to: 'UNKNOWN'", status)
+		log.Log.Warn("job's status is undesired value: %v, reset job status to: 'UNKNOWN'", status)
 		jobStatus = models.StatusUnknown
 		publishStatus = models.UnKnown
 	}