|
|
|
@@ -9,6 +9,7 @@ import ( |
|
|
|
"code.gitea.io/gitea/models" |
|
|
|
"code.gitea.io/gitea/modules/context" |
|
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
"code.gitea.io/gitea/modules/timeutil" |
|
|
|
"github.com/360EntSecGroup-Skylar/excelize/v2" |
|
|
|
|
|
|
|
"code.gitea.io/gitea/modules/setting" |
|
|
|
@@ -539,7 +540,7 @@ func GetCloudbrainsDetailData(ctx *context.Context) { |
|
|
|
taskDetail.Status = ciTasks[i].Status |
|
|
|
taskDetail.JobType = ciTasks[i].JobType |
|
|
|
taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix |
|
|
|
taskDetail.RunTime = ciTasks[i].EndTime - ciTasks[i].StartTime |
|
|
|
taskDetail.RunTime = ciTasks[i].Cloudbrain.Duration |
|
|
|
taskDetail.StartTime = ciTasks[i].StartTime |
|
|
|
taskDetail.EndTime = ciTasks[i].EndTime |
|
|
|
taskDetail.ComputeResource = ciTasks[i].ComputeResource |
|
|
|
@@ -685,7 +686,7 @@ func GetWaittingTop(ctx *context.Context) { |
|
|
|
taskDetail.Status = ciTasks[i].Status |
|
|
|
taskDetail.JobType = ciTasks[i].JobType |
|
|
|
taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix |
|
|
|
taskDetail.RunTime = ciTasks[i].EndTime - ciTasks[i].StartTime |
|
|
|
taskDetail.RunTime = ciTasks[i].Cloudbrain.Duration |
|
|
|
taskDetail.StartTime = ciTasks[i].StartTime |
|
|
|
taskDetail.EndTime = ciTasks[i].EndTime |
|
|
|
taskDetail.ComputeResource = ciTasks[i].ComputeResource |
|
|
|
@@ -695,7 +696,7 @@ func GetWaittingTop(ctx *context.Context) { |
|
|
|
if ciTasks[i].Repo != nil { |
|
|
|
taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name |
|
|
|
} |
|
|
|
taskDetail.WaitTime = ciTasks[i].StartTime - ciTasks[i].Cloudbrain.CreatedUnix |
|
|
|
taskDetail.WaitTime = timeutil.TimeStamp(time.Now().Unix()) - ciTasks[i].Cloudbrain.CreatedUnix |
|
|
|
if taskDetail.WaitTime < 0 { |
|
|
|
taskDetail.WaitTime = 0 |
|
|
|
} |
|
|
|
@@ -723,7 +724,7 @@ func GetRunningTop(ctx *context.Context) { |
|
|
|
taskDetail.Status = ciTasks[i].Status |
|
|
|
taskDetail.JobType = ciTasks[i].JobType |
|
|
|
taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix |
|
|
|
taskDetail.RunTime = ciTasks[i].EndTime - ciTasks[i].StartTime |
|
|
|
taskDetail.RunTime = ciTasks[i].Cloudbrain.Duration |
|
|
|
taskDetail.StartTime = ciTasks[i].StartTime |
|
|
|
taskDetail.EndTime = ciTasks[i].EndTime |
|
|
|
taskDetail.ComputeResource = ciTasks[i].ComputeResource |
|
|
|
@@ -733,7 +734,7 @@ func GetRunningTop(ctx *context.Context) { |
|
|
|
if ciTasks[i].Repo != nil { |
|
|
|
taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name |
|
|
|
} |
|
|
|
taskDetail.WaitTime = ciTasks[i].StartTime - ciTasks[i].Cloudbrain.CreatedUnix |
|
|
|
taskDetail.WaitTime = timeutil.TimeStamp(time.Now().Unix()) - ciTasks[i].Cloudbrain.CreatedUnix |
|
|
|
if taskDetail.WaitTime < 0 { |
|
|
|
taskDetail.WaitTime = 0 |
|
|
|
} |
|
|
|
|