This is an automated email from the ASF dual-hosted git repository.
warren pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 6f822ddd251ea24c4547c3ef957a66bbbda1d121
Author: abeizn <zi...@merico.dev>
AuthorDate: Mon Sep 19 18:52:01 2022 +0800
feat: add deployTagPattern for jenkins and fix jenkins bugs
---
.../jenkins/e2e/snapshot_tables/_tool_jenkins_stages.csv | 14 ++------------
.../e2e/snapshot_tables/cicd_tasks_after_stages.csv | 3 ---
plugins/jenkins/tasks/build_extractor.go | 9 +++++++++
plugins/jenkins/tasks/stage_collector.go | 6 +++---
4 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/plugins/jenkins/e2e/snapshot_tables/_tool_jenkins_stages.csv b/plugins/jenkins/e2e/snapshot_tables/_tool_jenkins_stages.csv
index c96c101f..768d8c39 100644
--- a/plugins/jenkins/e2e/snapshot_tables/_tool_jenkins_stages.csv
+++ b/plugins/jenkins/e2e/snapshot_tables/_tool_jenkins_stages.csv
@@ -1,13 +1,3 @@
connection_id,id,build_name,name,exec_node,status,start_time_millis,duration_millis,pause_duration_millis,type,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-1,6,Auto Init Gitlab #1,gitlabInit,,FAILED,1583329644046,588,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13574,
-1,6,Auto Init Gitlab #18,gitlabInit,,FAILED,1584458835920,215100,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13575,
-1,6,Auto Init Gitlab #19,gitlabInit,,ABORTED,1584497957140,5859,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13580,
-1,6,Auto Init Gitlab #23,gitlabInit,,ABORTED,1605767269680,248279,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13582,
-1,6,Auto Init Gitlab #58,gitlabInit,,ABORTED,1615296910614,1312274,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13578,
-1,6,Test Gitlab Sync #10,gitlabAutoSync,,SUCCESS,1583981120136,86044,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13583,
-1,6,Test Gitlab Sync #12,gitlabAutoSync,,SUCCESS,1583981125465,83641,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13581,
-1,6,Test Gitlab Sync #3,gitlabAutoSync,,SUCCESS,1581076468986,14118,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13579,
-1,6,pipeline-test2 #1,Hello,,SUCCESS,1662651617917,258,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,5,
-1,6,pipeline-test2 #2,Hello,,SUCCESS,1662651634424,79,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,6,
-1,6,pipeline-test2 #3,Hello,,SUCCESS,1662651649629,122,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,3,
-1,8,Pipeline expirement #5,scp-f/b,,FAILED,1572321694770,297,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13577,
+1,6,,gitlabAutoSync,,SUCCESS,1583981120136,86044,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13583,
+1,8,,scp-f/b,,FAILED,1572321694770,297,0,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,13577,
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 3480c821..1a32ab46 100644
--- a/plugins/jenkins/e2e/snapshot_tables/cicd_tasks_after_stages.csv
+++ b/plugins/jenkins/e2e/snapshot_tables/cicd_tasks_after_stages.csv
@@ -1,4 +1 @@
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:pipeline-test2 #1:Hello,Hello,jenkins:JenkinsBuild:1:pipeline-test2 #1,ABORT,DONE,,0,1970-01-01T00:00:00.000+00:00,2022-09-08T15:40:17.000+00:00,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,5,
-jenkins:JenkinsStage:1:pipeline-test2 #2:Hello,Hello,jenkins:JenkinsBuild:1:pipeline-test2 #2,ABORT,DONE,,0,1970-01-01T00:00:00.000+00:00,2022-09-08T15:40:34.000+00:00,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,6,
-jenkins:JenkinsStage:1:pipeline-test2 #3:Hello,Hello,jenkins:JenkinsBuild:1:pipeline-test2 #3,ABORT,DONE,,0,1970-01-01T00:00:00.000+00:00,2022-09-08T15:40:49.000+00:00,,"{""ConnectionId"":1}",_raw_jenkins_api_stages,3,
diff --git a/plugins/jenkins/tasks/build_extractor.go b/plugins/jenkins/tasks/build_extractor.go
index 7061d864..ee3e517c 100644
--- a/plugins/jenkins/tasks/build_extractor.go
+++ b/plugins/jenkins/tasks/build_extractor.go
@@ -86,7 +86,15 @@ func ExtractApiBuilds(taskCtx core.SubTaskContext) errors.Error {
vcs := body.ChangeSet.Kind
if vcs == "git" || vcs == "hg" {
for _, a := range body.Actions {
+ sha := ""
branch := ""
+ if a.LastBuiltRevision.SHA1 != "" {
+ sha = a.LastBuiltRevision.SHA1
+ }
+ if a.MercurialRevisionNumber != "" {
+ sha = a.MercurialRevisionNumber
+ }
+
if len(a.LastBuiltRevision.Branches) > 0 {
branch = a.LastBuiltRevision.Branches[0].Name
}
@@ -95,6 +103,7 @@ func ExtractApiBuilds(taskCtx core.SubTaskContext) errors.Error {
buildCommitRemoteUrl := models.JenkinsBuildCommit{
ConnectionId: data.Options.ConnectionId,
BuildName: build.FullDisplayName,
+ CommitSha: sha,
RepoUrl: url,
Branch: branch,
}
diff --git a/plugins/jenkins/tasks/stage_collector.go b/plugins/jenkins/tasks/stage_collector.go
index 7e3f0fc9..9cd249c5 100644
--- a/plugins/jenkins/tasks/stage_collector.go
+++ b/plugins/jenkins/tasks/stage_collector.go
@@ -40,9 +40,9 @@ var CollectApiStagesMeta = core.SubTaskMeta{
}
type SimpleBuild struct {
- Path string
- JobName string
- Number string
+ Path string
+ JobName string
+ Number string
FullDisplayName string
}