You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2022/11/08 01:37:33 UTC
[incubator-devlake] branch main updated: fix(cicd): keep result empty if unfinished (#3694)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 00543406 fix(cicd): keep result empty if unfinished (#3694)
00543406 is described below
commit 00543406c94c6f1e2ffd4527dea8d60c2ff6afcb
Author: Warren Chen <yi...@merico.dev>
AuthorDate: Tue Nov 8 09:37:29 2022 +0800
fix(cicd): keep result empty if unfinished (#3694)
---
models/domainlayer/devops/cicd_pipeline.go | 1 -
plugins/github/e2e/snapshot_tables/cicd_pipelines.csv | 4 ++--
plugins/github/e2e/snapshot_tables/cicd_tasks.csv | 16 ++++++++--------
plugins/github/tasks/cicd_job_convertor.go | 9 ++++++---
plugins/github/tasks/cicd_run_convertor.go | 9 ++++++---
plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv | 4 ++--
plugins/gitlab/tasks/job_convertor.go | 2 +-
plugins/gitlab/tasks/pipeline_convertor.go | 2 +-
plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv | 2 +-
plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv | 2 +-
.../e2e/snapshot_tables/cicd_tasks_after_stages.csv | 14 +++++++-------
plugins/jenkins/tasks/build_cicd_convertor.go | 2 +-
plugins/jenkins/tasks/stage_convertor.go | 2 +-
13 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/models/domainlayer/devops/cicd_pipeline.go b/models/domainlayer/devops/cicd_pipeline.go
index e86e0b5b..e92c1c4e 100644
--- a/models/domainlayer/devops/cicd_pipeline.go
+++ b/models/domainlayer/devops/cicd_pipeline.go
@@ -42,7 +42,6 @@ func (CICDPipeline) TableName() string {
// this is for the field `result` in table.cicd_pipelines and table.cicd_tasks
const (
SUCCESS = "SUCCESS"
- RUNNING = "RUNNING"
FAILURE = "FAILURE"
ABORT = "ABORT"
MANUAL = "MANUAL"
diff --git a/plugins/github/e2e/snapshot_tables/cicd_pipelines.csv b/plugins/github/e2e/snapshot_tables/cicd_pipelines.csv
index 1503c1af..82685e70 100644
--- a/plugins/github/e2e/snapshot_tables/cicd_pipelines.csv
+++ b/plugins/github/e2e/snapshot_tables/cicd_pipelines.csv
@@ -2,8 +2,8 @@ id,name,result,status,type,duration_sec,environment,created_date,finished_date,_
github:GithubRun:1:134018330:2559400712,CodeQL,SUCCESS,DONE,,116353,,2022-06-25T04:17:45.000+00:00,2022-06-26T12:36:58.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,20,
github:GithubRun:1:134018330:2559400713,Lint,SUCCESS,DONE,,116317,,2022-06-25T04:17:45.000+00:00,2022-06-26T12:36:22.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,19,
github:GithubRun:1:134018330:2559400714,Tests,SUCCESS,DONE,,116619,,2022-06-25T04:17:45.000+00:00,2022-06-26T12:41:24.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,18,
-github:GithubRun:1:134018330:2559507315,CodeQL,RUNNING,IN_PROGRESS,,0,,2022-06-25T05:02:56.000+00:00,2022-06-25T05:03:53.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,17,
-github:GithubRun:1:134018330:2566218975,Tests,RUNNING,IN_PROGRESS,,0,,2022-06-27T01:29:54.000+00:00,2022-06-27T01:37:33.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,16,
+github:GithubRun:1:134018330:2559507315,CodeQL,,IN_PROGRESS,,0,,2022-06-25T05:02:56.000+00:00,2022-06-25T05:03:53.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,17,
+github:GithubRun:1:134018330:2566218975,Tests,,IN_PROGRESS,,0,,2022-06-27T01:29:54.000+00:00,2022-06-27T01:37:33.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,16,
github:GithubRun:1:134018330:2566218976,CodeQL,SUCCESS,DONE,,61,,2022-06-27T01:29:54.000+00:00,2022-06-27T01:30:55.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,15,
github:GithubRun:1:134018330:2566218977,Lint,FAILURE,DONE,,34,,2022-06-27T01:29:54.000+00:00,2022-06-27T01:30:28.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,14,
github:GithubRun:1:134018330:2589885628,Tests,SUCCESS,DONE,,91030,,2022-06-30T12:23:37.000+00:00,2022-07-01T13:40:47.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_runs,13,
diff --git a/plugins/github/e2e/snapshot_tables/cicd_tasks.csv b/plugins/github/e2e/snapshot_tables/cicd_tasks.csv
index afe6f5fd..7f9eebae 100644
--- a/plugins/github/e2e/snapshot_tables/cicd_tasks.csv
+++ b/plugins/github/e2e/snapshot_tables/cicd_tasks.csv
@@ -1,16 +1,16 @@
id,name,pipeline_id,result,status,type,duration_sec,started_date,finished_date,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-github:GithubJob:1:577324554:1924918171,"Go-Test (1.14.x, ubuntu-latest)",github:GithubRun:1:134018330:577324554,RUNNING,DONE,,125,2021-02-18T06:59:13.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,1,
-github:GithubJob:1:577324554:1924918191,"Go-Test (1.14.x, macos-latest)",github:GithubRun:1:134018330:577324554,RUNNING,DONE,,117,2021-02-18T06:59:21.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,2,
-github:GithubJob:1:577324554:1924918205,"Go-Test (1.14.x, windows-latest)",github:GithubRun:1:134018330:577324554,RUNNING,DONE,,114,2021-02-18T06:59:15.000+00:00,2021-02-18T07:01:09.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,3,
-github:GithubJob:1:577324554:1924918228,"Go-Test (1.15.x, ubuntu-latest)",github:GithubRun:1:134018330:577324554,RUNNING,DONE,,125,2021-02-18T06:59:13.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,4,
-github:GithubJob:1:577324554:1924918243,"Go-Test (1.15.x, macos-latest)",github:GithubRun:1:134018330:577324554,RUNNING,DONE,,119,2021-02-18T06:59:19.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,5,
-github:GithubJob:1:577324554:1924918261,"Go-Test (1.15.x, windows-latest)",github:GithubRun:1:134018330:577324554,RUNNING,DONE,,114,2021-02-18T06:59:15.000+00:00,2021-02-18T07:01:09.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,6,
+github:GithubJob:1:577324554:1924918171,"Go-Test (1.14.x, ubuntu-latest)",github:GithubRun:1:134018330:577324554,,DONE,,125,2021-02-18T06:59:13.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,1,
+github:GithubJob:1:577324554:1924918191,"Go-Test (1.14.x, macos-latest)",github:GithubRun:1:134018330:577324554,,DONE,,117,2021-02-18T06:59:21.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,2,
+github:GithubJob:1:577324554:1924918205,"Go-Test (1.14.x, windows-latest)",github:GithubRun:1:134018330:577324554,,DONE,,114,2021-02-18T06:59:15.000+00:00,2021-02-18T07:01:09.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,3,
+github:GithubJob:1:577324554:1924918228,"Go-Test (1.15.x, ubuntu-latest)",github:GithubRun:1:134018330:577324554,,DONE,,125,2021-02-18T06:59:13.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,4,
+github:GithubJob:1:577324554:1924918243,"Go-Test (1.15.x, macos-latest)",github:GithubRun:1:134018330:577324554,,DONE,,119,2021-02-18T06:59:19.000+00:00,2021-02-18T07:01:18.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,5,
+github:GithubJob:1:577324554:1924918261,"Go-Test (1.15.x, windows-latest)",github:GithubRun:1:134018330:577324554,,DONE,,114,2021-02-18T06:59:15.000+00:00,2021-02-18T07:01:09.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,6,
github:GithubJob:1:577324558:1924918168,Golangci-Lint,github:GithubRun:1:134018330:577324558,SUCCESS,DONE,,20,2021-02-18T06:59:13.000+00:00,2021-02-18T06:59:33.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,8,
github:GithubJob:1:577324571:1924918319,Analyze,github:GithubRun:1:134018330:577324571,SUCCESS,DONE,,61,2021-02-18T06:59:16.000+00:00,2021-02-18T07:00:17.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,9,
github:GithubJob:1:577330055:1924932184,Analyze,github:GithubRun:1:134018330:577330055,SUCCESS,DONE,,54,2021-02-18T07:02:02.000+00:00,2021-02-18T07:02:56.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,10,
github:GithubJob:1:577330056:1924932219,"Go-Test (1.14.x, ubuntu-latest)",github:GithubRun:1:134018330:577330056,SUCCESS,DONE,,180,2021-02-18T07:02:03.000+00:00,2021-02-18T07:05:03.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,11,
-github:GithubJob:1:577330056:1924932237,"Go-Test (1.14.x, macos-latest)",github:GithubRun:1:134018330:577330056,RUNNING,IN_PROGRESS,,0,2021-02-18T07:02:06.000+00:00,2021-02-18T07:04:44.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,12,
-github:GithubJob:1:577330056:1924932251,"Go-Test (1.14.x, windows-latest)",github:GithubRun:1:134018330:577330056,RUNNING,IN_PROGRESS,,0,2021-02-18T07:02:03.000+00:00,2021-02-18T07:05:57.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,13,
+github:GithubJob:1:577330056:1924932237,"Go-Test (1.14.x, macos-latest)",github:GithubRun:1:134018330:577330056,,IN_PROGRESS,,0,2021-02-18T07:02:06.000+00:00,2021-02-18T07:04:44.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,12,
+github:GithubJob:1:577330056:1924932251,"Go-Test (1.14.x, windows-latest)",github:GithubRun:1:134018330:577330056,,IN_PROGRESS,,0,2021-02-18T07:02:03.000+00:00,2021-02-18T07:05:57.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,13,
github:GithubJob:1:577330056:1924932266,"Go-Test (1.15.x, ubuntu-latest)",github:GithubRun:1:134018330:577330056,SUCCESS,DONE,,161,2021-02-18T07:02:03.000+00:00,2021-02-18T07:04:44.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,14,
github:GithubJob:1:577330056:1924932293,"Go-Test (1.15.x, macos-latest)",github:GithubRun:1:134018330:577330056,SUCCESS,DONE,,158,2021-02-18T07:02:06.000+00:00,2021-02-18T07:04:44.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,15,
github:GithubJob:1:577330056:1924932319,"Go-Test (1.15.x, windows-latest)",github:GithubRun:1:134018330:577330056,SUCCESS,DONE,,230,2021-02-18T07:02:03.000+00:00,2021-02-18T07:05:53.000+00:00,"{""ConnectionId"":1,""Owner"":""panjf2000"",""Repo"":""ants""}",_raw_github_api_jobs,16,
diff --git a/plugins/github/tasks/cicd_job_convertor.go b/plugins/github/tasks/cicd_job_convertor.go
index 9d008952..abbfb2e9 100644
--- a/plugins/github/tasks/cicd_job_convertor.go
+++ b/plugins/github/tasks/cicd_job_convertor.go
@@ -20,6 +20,7 @@ package tasks
import (
"reflect"
"regexp"
+ "strings"
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/models/domainlayer/didgen"
@@ -99,12 +100,14 @@ func ConvertJobs(taskCtx core.SubTaskContext) (err errors.Error) {
domainJob.Type = devops.DEPLOYMENT
}
}
- if line.Conclusion == "success" {
+ if strings.Contains(line.Conclusion, "success") {
domainJob.Result = devops.SUCCESS
- } else if line.Conclusion == "failure" || line.Conclusion == "startup_failure" {
+ } else if strings.Contains(line.Conclusion, "failure") {
domainJob.Result = devops.FAILURE
+ } else if strings.Contains(line.Conclusion, "abort") {
+ domainJob.Result = devops.ABORT
} else {
- domainJob.Result = devops.RUNNING
+ domainJob.Result = ""
}
if line.Status != "completed" {
diff --git a/plugins/github/tasks/cicd_run_convertor.go b/plugins/github/tasks/cicd_run_convertor.go
index 480da981..2eed287c 100644
--- a/plugins/github/tasks/cicd_run_convertor.go
+++ b/plugins/github/tasks/cicd_run_convertor.go
@@ -19,6 +19,7 @@ package tasks
import (
"reflect"
+ "strings"
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/models/domainlayer"
@@ -77,12 +78,14 @@ func ConvertRuns(taskCtx core.SubTaskContext) errors.Error {
CreatedDate: *line.GithubCreatedAt,
FinishedDate: line.GithubUpdatedAt,
}
- if line.Conclusion == "success" {
+ if strings.Contains(line.Conclusion, "success") {
domainPipeline.Result = devops.SUCCESS
- } else if line.Conclusion == "failure" || line.Conclusion == "startup_failure" {
+ } else if strings.Contains(line.Conclusion, "failure") {
domainPipeline.Result = devops.FAILURE
+ } else if strings.Contains(line.Conclusion, "abort") {
+ domainPipeline.Result = devops.ABORT
} else {
- domainPipeline.Result = devops.RUNNING
+ domainPipeline.Result = ""
}
if line.Status != "completed" {
diff --git a/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv b/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv
index ef205cb2..ceef0f17 100644
--- a/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv
+++ b/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv
@@ -1,8 +1,8 @@
id,name,result,status,type,duration_sec,created_date,finished_date,environment,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-gitlab:GitlabPipeline:1:457474837,gitlab:GitlabProject:1:12345678,RUNNING,IN_PROGRESS,,0,2022-01-27T10:07:09.429+00:00,,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,152,
+gitlab:GitlabPipeline:1:457474837,gitlab:GitlabProject:1:12345678,,IN_PROGRESS,,0,2022-01-27T10:07:09.429+00:00,,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,152,
gitlab:GitlabPipeline:1:457474996,gitlab:GitlabProject:1:12345678,FAILURE,DONE,,0,2022-01-27T10:07:18.884+00:00,2022-01-27T10:07:19.043+00:00,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,153,
gitlab:GitlabPipeline:1:457475160,gitlab:GitlabProject:1:12345678,FAILURE,DONE,,0,2022-01-27T10:07:26.435+00:00,2022-01-27T10:07:26.638+00:00,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,154,
-gitlab:GitlabPipeline:1:457475337,gitlab:GitlabProject:1:12345678,RUNNING,IN_PROGRESS,,0,2022-01-27T10:07:36.502+00:00,,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,155,
+gitlab:GitlabPipeline:1:457475337,gitlab:GitlabProject:1:12345678,,IN_PROGRESS,,0,2022-01-27T10:07:36.502+00:00,,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,155,
gitlab:GitlabPipeline:1:485811050,gitlab:GitlabProject:1:12345678,FAILURE,DONE,,0,2022-03-07T06:26:42.109+00:00,2022-03-07T06:26:42.109+00:00,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,156,
gitlab:GitlabPipeline:1:485811059,gitlab:GitlabProject:1:12345678,FAILURE,DONE,,0,2022-03-07T06:26:43.784+00:00,2022-03-07T06:26:43.784+00:00,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,157,
gitlab:GitlabPipeline:1:485813816,gitlab:GitlabProject:1:12345678,FAILURE,DONE,,0,2022-03-07T06:33:56.824+00:00,2022-03-07T06:33:56.824+00:00,,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_pipeline,158,
diff --git a/plugins/gitlab/tasks/job_convertor.go b/plugins/gitlab/tasks/job_convertor.go
index cf54a0ca..418c90a1 100644
--- a/plugins/gitlab/tasks/job_convertor.go
+++ b/plugins/gitlab/tasks/job_convertor.go
@@ -92,7 +92,7 @@ func ConvertJobs(taskCtx core.SubTaskContext) (err errors.Error) {
Abort: []string{"canceled", "skipped"},
Manual: []string{"manual"},
Success: []string{"success"},
- Default: devops.RUNNING,
+ Default: "",
}, gitlabJob.Status),
Status: devops.GetStatus(&devops.StatusRule{
InProgress: []string{"created", "waiting_for_resource", "preparing", "pending", "running", "scheduled"},
diff --git a/plugins/gitlab/tasks/pipeline_convertor.go b/plugins/gitlab/tasks/pipeline_convertor.go
index 6251664a..350f2a5c 100644
--- a/plugins/gitlab/tasks/pipeline_convertor.go
+++ b/plugins/gitlab/tasks/pipeline_convertor.go
@@ -82,7 +82,7 @@ func ConvertPipelines(taskCtx core.SubTaskContext) errors.Error {
Failed: []string{"failed"},
Abort: []string{"canceled", "skipped"},
Success: []string{"success"},
- Default: devops.RUNNING,
+ Default: "",
}, gitlabPipeline.Status),
Status: devops.GetStatus(&devops.StatusRule{
InProgress: []string{"created", "waiting_for_resource", "preparing", "pending", "running", "manual", "scheduled"},
diff --git a/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv b/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv
index 1dc12fe7..dc9f54e8 100644
--- a/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv
+++ b/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv
@@ -28,7 +28,7 @@ jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #1,这是一个
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #10,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-09-08T14:27:13.000+00:00,2022-09-08T14:27:13.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,115,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #11,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-09-08T15:40:56.000+00:00,2022-09-08T15:40:56.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,114,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #12,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-09-08T15:40:57.000+00:00,2022-09-08T15:40:57.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,113,
-jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,RUNNING,IN_PROGRESS,,0,,2022-04-15T10:06:17.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,123,
+jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,,IN_PROGRESS,,0,,2022-04-15T10:06:17.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,123,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #3,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T10:06:26.000+00:00,2022-04-15T10:06:26.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,122,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #4,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T11:35:56.000+00:00,2022-04-15T11:35:56.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,121,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #5,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T11:35:58.000+00:00,2022-04-15T11:35:58.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,120,
diff --git a/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv b/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv
index 9f6ce455..344fb931 100644
--- a/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv
+++ b/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv
@@ -28,7 +28,7 @@ jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #1,这是一个
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #10,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #10,SUCCESS,DONE,,,0,2022-09-08T14:27:13.000+00:00,2022-09-08T14:27:13.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,115,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #11,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #11,SUCCESS,DONE,,,0,2022-09-08T15:40:56.000+00:00,2022-09-08T15:40:56.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,114,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #12,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #12,SUCCESS,DONE,,,0,2022-09-08T15:40:57.000+00:00,2022-09-08T15:40:57.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,113,
-jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #2,RUNNING,IN_PROGRESS,,,0,2022-04-15T10:06:17.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,123,
+jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #2,,IN_PROGRESS,,,0,2022-04-15T10:06:17.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,123,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #3,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #3,SUCCESS,DONE,,,0,2022-04-15T10:06:26.000+00:00,2022-04-15T10:06:26.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,122,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #4,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #4,SUCCESS,DONE,,,0,2022-04-15T11:35:56.000+00:00,2022-04-15T11:35:56.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,121,
jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #5,这是一个改了名字的测试任务,jenkins:JenkinsBuild:1:这是一个改了名字的测试任务 #5,SUCCESS,DONE,,,0,2022-04-15T11:35:58.000+00:00,2022-04-15T11:35:58.000+00:00,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_builds,120,
diff --git a/plugins/jenkins/e2e/snapshot_tables/cicd_tasks_after_stages.csv b/plugins/jenkins/e2e/snapshot_tables/cicd_tasks_after_stages.csv
index d4920ed3..19352017 100644
--- a/plugins/jenkins/e2e/snapshot_tables/cicd_tasks_after_stages.csv
+++ b/plugins/jenkins/e2e/snapshot_tables/cicd_tasks_after_stages.csv
@@ -1,11 +1,11 @@
id,name,pipeline_id,result,status,type,duration_sec,started_date,finished_date,environment,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-jenkins:JenkinsStage:1:Auto Init Gitlab #1:12,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #1,RUNNING,IN_PROGRESS,,0,1970-01-01T00:00:00.000+00:00,2020-03-04T13:47:24.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13574,
-jenkins:JenkinsStage:1:Auto Init Gitlab #18:6,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #18,RUNNING,IN_PROGRESS,,215,1970-01-01T00:03:35.000+00:00,2020-03-17T15:30:50.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13575,
-jenkins:JenkinsStage:1:Auto Init Gitlab #19:2,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #19,RUNNING,IN_PROGRESS,,5,1970-01-01T00:00:05.000+00:00,2020-03-18T02:19:22.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13580,
-jenkins:JenkinsStage:1:Auto Init Gitlab #19:7,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #19,RUNNING,IN_PROGRESS,,5,1970-01-01T00:00:05.000+00:00,2020-03-18T02:19:22.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13576,
-jenkins:JenkinsStage:1:Auto Init Gitlab #23:4,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #23,RUNNING,IN_PROGRESS,,248,1970-01-01T00:04:08.000+00:00,2020-11-19T06:31:57.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13582,
-jenkins:JenkinsStage:1:Auto Init Gitlab #58:9,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #58,RUNNING,IN_PROGRESS,,1312,1970-01-01T00:21:52.000+00:00,2021-03-09T13:57:02.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13578,
-jenkins:JenkinsStage:1:Pipeline expirement #5:8,scp-f/b,jenkins:JenkinsBuild:1:Pipeline expirement #5,RUNNING,IN_PROGRESS,,0,1970-01-01T00:00:00.000+00:00,2019-10-29T04:01:34.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13577,
+jenkins:JenkinsStage:1:Auto Init Gitlab #1:12,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #1,,IN_PROGRESS,,0,1970-01-01T00:00:00.000+00:00,2020-03-04T13:47:24.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13574,
+jenkins:JenkinsStage:1:Auto Init Gitlab #18:6,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #18,,IN_PROGRESS,,215,1970-01-01T00:03:35.000+00:00,2020-03-17T15:30:50.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13575,
+jenkins:JenkinsStage:1:Auto Init Gitlab #19:2,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #19,,IN_PROGRESS,,5,1970-01-01T00:00:05.000+00:00,2020-03-18T02:19:22.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13580,
+jenkins:JenkinsStage:1:Auto Init Gitlab #19:7,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #19,,IN_PROGRESS,,5,1970-01-01T00:00:05.000+00:00,2020-03-18T02:19:22.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13576,
+jenkins:JenkinsStage:1:Auto Init Gitlab #23:4,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #23,,IN_PROGRESS,,248,1970-01-01T00:04:08.000+00:00,2020-11-19T06:31:57.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13582,
+jenkins:JenkinsStage:1:Auto Init Gitlab #58:9,gitlabInit,jenkins:JenkinsBuild:1:Auto Init Gitlab #58,,IN_PROGRESS,,1312,1970-01-01T00:21:52.000+00:00,2021-03-09T13:57:02.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13578,
+jenkins:JenkinsStage:1:Pipeline expirement #5:8,scp-f/b,jenkins:JenkinsBuild:1:Pipeline expirement #5,,IN_PROGRESS,,0,1970-01-01T00:00:00.000+00:00,2019-10-29T04:01:34.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,13577,
jenkins:JenkinsStage:1:pipeline-test2 #1:10,Hello,jenkins:JenkinsBuild:1:pipeline-test2 #1,SUCCESS,DONE,,0,1970-01-01T00:00:00.000+00:00,2022-09-08T15:40:17.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,5,
jenkins:JenkinsStage:1:pipeline-test2 #1:9,Hello,jenkins:JenkinsBuild:1:pipeline-test2 #1,SUCCESS,DONE,,0,1970-01-01T00:00:00.000+00:00,2022-09-08T15:40:17.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,4,
jenkins:JenkinsStage:1:pipeline-test2 #2:11,Hello,jenkins:JenkinsBuild:1:pipeline-test2 #2,SUCCESS,DONE,,0,1970-01-01T00:00:00.000+00:00,2022-09-08T15:40:34.000+00:00,,"{""ConnectionId"":1,""JobName"":""devlake""}",_raw_jenkins_api_stages,6,
diff --git a/plugins/jenkins/tasks/build_cicd_convertor.go b/plugins/jenkins/tasks/build_cicd_convertor.go
index d462da2d..88f4c5b0 100644
--- a/plugins/jenkins/tasks/build_cicd_convertor.go
+++ b/plugins/jenkins/tasks/build_cicd_convertor.go
@@ -91,7 +91,7 @@ func ConvertBuildsToCICD(taskCtx core.SubTaskContext) (err errors.Error) {
if jenkinsBuild.Building {
jenkinsPipelineStatus = devops.IN_PROGRESS
- jenkinsPipelineResult = devops.RUNNING
+ jenkinsPipelineResult = ""
} else {
jenkinsPipelineStatus = devops.DONE
finishTime := jenkinsBuild.StartTime.Add(time.Duration(durationSec * int64(time.Second)))
diff --git a/plugins/jenkins/tasks/stage_convertor.go b/plugins/jenkins/tasks/stage_convertor.go
index 1bc4c6f5..c29782f0 100644
--- a/plugins/jenkins/tasks/stage_convertor.go
+++ b/plugins/jenkins/tasks/stage_convertor.go
@@ -119,7 +119,7 @@ func ConvertStages(taskCtx core.SubTaskContext) (err errors.Error) {
} else if body.Result == "ABORTED" {
jenkinsTaskResult = devops.ABORT
} else {
- jenkinsTaskResult = devops.RUNNING
+ jenkinsTaskResult = ""
jenkinsTaskStatus = devops.IN_PROGRESS
}