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
commit 39d35503b875cfddbb075c30e86347178a62cf43 Author: Yingchu Chen <[email protected]> AuthorDate: Thu Sep 15 22:34:20 2022 +0800 fix(framework): use repoUrl&repoId instead of repo --- models/domainlayer/devops/cicd_pipeline_commmit.go | 3 +- models/migrationscripts/20220818_add_cicd.go | 2 +- .../20220905_modfiy_cicd_pipeline.go | 2 +- .../20220915_rename_pipeline_commits.go | 7 +- .../e2e/raw_tables/lake_cicd_pipeline_commits.csv | 2 +- plugins/dora/tasks/change_lead_time_calculator.go | 2 +- plugins/dora/tasks/cicd_task_env_enricher.go | 2 +- plugins/dora/tasks/issue_deploy_connector.go | 2 +- plugins/github/e2e/cicd_test.go | 135 +++++++------- .../e2e/snapshot_tables/cicd_pipeline_commits.csv | 196 ++++++++++----------- plugins/github/tasks/cicd_pipeline_convertor.go | 2 +- plugins/gitlab/e2e/pipelines_test.go | 3 +- .../e2e/snapshot_tables/cicd_pipeline_commits.csv | 42 ++--- .../gitlab/e2e/snapshot_tables/cicd_pipelines.csv | 40 ++--- plugins/gitlab/tasks/pipeline_convertor.go | 1 - plugins/gitlab/tasks/pipeline_project_convertor.go | 2 +- plugins/jenkins/e2e/builds_test.go | 4 +- .../e2e/snapshot_tables/cicd_pipeline_commits.csv | 10 +- .../jenkins/e2e/snapshot_tables/cicd_pipelines.csv | 74 ++++---- plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv | 74 ++++---- plugins/jenkins/tasks/build_cicd_convertor.go | 2 - plugins/jenkins/tasks/build_repo_convertor.go | 2 +- 22 files changed, 301 insertions(+), 308 deletions(-) diff --git a/models/domainlayer/devops/cicd_pipeline_commmit.go b/models/domainlayer/devops/cicd_pipeline_commmit.go index a9bcf3fd..68236f39 100644 --- a/models/domainlayer/devops/cicd_pipeline_commmit.go +++ b/models/domainlayer/devops/cicd_pipeline_commmit.go @@ -24,7 +24,8 @@ type CiCDPipelineCommit struct { PipelineId string `gorm:"primaryKey;type:varchar(255)"` CommitSha string `gorm:"primaryKey;type:varchar(255)"` Branch string `gorm:"type:varchar(255)"` - Repo string `gorm:"index;type:varchar(255)"` + RepoId string `gorm:"index;type:varchar(255)"` + RepoUrl string } func (CiCDPipelineCommit) TableName() string { diff --git a/models/migrationscripts/20220818_add_cicd.go b/models/migrationscripts/20220818_add_cicd.go index 0e3e5d17..c03cc39d 100644 --- a/models/migrationscripts/20220818_add_cicd.go +++ b/models/migrationscripts/20220818_add_cicd.go @@ -87,5 +87,5 @@ type CICDPipelineRepo struct { } func (CICDPipelineRepo) TableName() string { - return "cicd_pipeline_commits" + return "cicd_pipeline_repos" } diff --git a/models/migrationscripts/20220905_modfiy_cicd_pipeline.go b/models/migrationscripts/20220905_modfiy_cicd_pipeline.go index 4088948a..dc9e0de1 100644 --- a/models/migrationscripts/20220905_modfiy_cicd_pipeline.go +++ b/models/migrationscripts/20220905_modfiy_cicd_pipeline.go @@ -74,7 +74,7 @@ type CICDPipelineRepo0905 struct { } func (CICDPipelineRepo0905) TableName() string { - return "cicd_pipeline_commits" + return "cicd_pipeline_repos" } type CICDPipelineRelationship0905 struct { diff --git a/models/migrationscripts/20220915_rename_pipeline_commits.go b/models/migrationscripts/20220915_rename_pipeline_commits.go index 7d192cc4..d4a7a21b 100644 --- a/models/migrationscripts/20220915_rename_pipeline_commits.go +++ b/models/migrationscripts/20220915_rename_pipeline_commits.go @@ -34,7 +34,7 @@ type CiCDPipelineRepoOld struct { } func (CiCDPipelineRepoOld) TableName() string { - return "cicd_pipeline_commits" + return "cicd_pipeline_repos" } type CiCDPipelineRepo0915 struct { @@ -42,7 +42,8 @@ type CiCDPipelineRepo0915 struct { PipelineId string `gorm:"primaryKey;type:varchar(255)"` CommitSha string `gorm:"primaryKey;type:varchar(255)"` Branch string `gorm:"type:varchar(255)"` - Repo string `gorm:"index;type:varchar(255)"` + RepoId string `gorm:"index;type:varchar(255)"` + RepoUrl string } func (CiCDPipelineRepo0915) TableName() string { @@ -58,7 +59,7 @@ func (*renamePipelineCommits) Up(ctx context.Context, db *gorm.DB) errors.Error if err != nil { return errors.Convert(err) } - err = db.Migrator().RenameIndex(CiCDPipelineRepo0915{}, `idx_cicd_pipeline_commits_raw_data_params`, `idx_cicd_pipeline_commits_raw_data_params`) + err = db.Migrator().DropIndex(CiCDPipelineRepo0915{}, `idx_cicd_pipeline_repos_raw_data_params`) if err != nil { return errors.Convert(err) } diff --git a/plugins/dora/e2e/raw_tables/lake_cicd_pipeline_commits.csv b/plugins/dora/e2e/raw_tables/lake_cicd_pipeline_commits.csv index 387384d8..ccf0a05b 100644 --- a/plugins/dora/e2e/raw_tables/lake_cicd_pipeline_commits.csv +++ b/plugins/dora/e2e/raw_tables/lake_cicd_pipeline_commits.csv @@ -1,4 +1,4 @@ -pipeline_id,created_at,updated_at,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,commit_sha,branch,repo +pipeline_id,created_at,updated_at,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,commit_sha,branch,repo_id github:GithubRun:1:3022052551,2022-09-15 03:20:03.452,2022-09-15 03:20:03.452,"","",0,"",74cc484551329c7f92dc03519398dba62f96f128,apache,github:GithubRepo:1:384111310 github:GithubRun:1:3022052555,2022-09-15 03:20:03.452,2022-09-15 03:20:03.452,"","",0,"",74cc484551329c7f92dc03519398dba62f96f128,apache,github:GithubRepo:1:384111310 github:GithubRun:1:3022052557,2022-09-15 03:20:03.452,2022-09-15 03:20:03.452,"","",0,"",74cc484551329c7f92dc03519398dba62f96f128,apache,github:GithubRepo:1:384111310 diff --git a/plugins/dora/tasks/change_lead_time_calculator.go b/plugins/dora/tasks/change_lead_time_calculator.go index c341fe61..14323655 100644 --- a/plugins/dora/tasks/change_lead_time_calculator.go +++ b/plugins/dora/tasks/change_lead_time_calculator.go @@ -153,7 +153,7 @@ func getDeployTime(repoId string, environment string, mergeDate time.Time, db da cicdTaskClauses := []dal.Clause{ dal.From(&devops.CICDTask{}), dal.Join("left join cicd_pipeline_commits on cicd_tasks.pipeline_id = cicd_pipeline_commits.pipeline_id"), - dal.Where(`cicd_pipeline_commits.repo = ? + dal.Where(`cicd_pipeline_commits.repo_id = ? and cicd_tasks.environment = ? and cicd_tasks.result = ? and cicd_tasks.started_date > ?`, diff --git a/plugins/dora/tasks/cicd_task_env_enricher.go b/plugins/dora/tasks/cicd_task_env_enricher.go index f03ee9ff..0f33326f 100644 --- a/plugins/dora/tasks/cicd_task_env_enricher.go +++ b/plugins/dora/tasks/cicd_task_env_enricher.go @@ -53,7 +53,7 @@ func EnrichTasksEnv(taskCtx core.SubTaskContext) (err errors.Error) { cursor, err := db.Cursor( dal.From(&devops.CICDTask{}), - dal.Join("left join cicd_pipeline_commits cpr on cpr.repo=? and cicd_tasks.pipeline_id = cpr.pipeline_id ", repoId), + dal.Join("left join cicd_pipeline_commits cpr on cpr.repo_id=? and cicd_tasks.pipeline_id = cpr.pipeline_id ", repoId), dal.Where("status=?", devops.DONE)) if err != nil { return err diff --git a/plugins/dora/tasks/issue_deploy_connector.go b/plugins/dora/tasks/issue_deploy_connector.go index af27d2a0..6dbd10f3 100644 --- a/plugins/dora/tasks/issue_deploy_connector.go +++ b/plugins/dora/tasks/issue_deploy_connector.go @@ -76,7 +76,7 @@ func ConnectIssueDeploy(taskCtx core.SubTaskContext) errors.Error { dal.From(cicdTask), dal.Join("left join cicd_pipeline_commits on cicd_tasks.pipeline_id = cicd_pipeline_commits.pipeline_id"), dal.Where( - `cicd_pipeline_commits.repo = ? and cicd_tasks.finished_date < ? + `cicd_pipeline_commits.repo_id = ? and cicd_tasks.finished_date < ? and cicd_tasks.result = ? and cicd_tasks.environment = ?`, data.Options.RepoId, issueToBeUpdate.CreatedDate, "SUCCESS", data.Options.Environment, ), diff --git a/plugins/github/e2e/cicd_test.go b/plugins/github/e2e/cicd_test.go index 984c7ebe..29ac8665 100644 --- a/plugins/github/e2e/cicd_test.go +++ b/plugins/github/e2e/cicd_test.go @@ -27,81 +27,7 @@ import ( "github.com/apache/incubator-devlake/plugins/github/tasks" ) -func TestGithubJobsDataFlow(t *testing.T) { - var github impl.Github - dataflowTester := e2ehelper.NewDataFlowTester(t, "github", github) - - taskData := &tasks.GithubTaskData{ - Options: &tasks.GithubOptions{ - ConnectionId: 1, - Owner: "panjf2000", - Repo: "ants", - }, - Repo: &models.GithubRepo{ - GithubId: 134018330, - }, - } - - // import raw data table - // SELECT * FROM _raw_github_api_jobs INTO OUTFILE "/tmp/_raw_github_api_jobs.csv" FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\r\n'; - dataflowTester.ImportCsvIntoRawTable("./raw_tables/_raw_github_api_jobs.csv", "_raw_github_api_jobs") - - // verify extraction - dataflowTester.FlushTabler(&models.GithubJob{}) - dataflowTester.FlushTabler(&devops.CICDTask{}) - - dataflowTester.Subtask(tasks.ExtractJobsMeta, taskData) - dataflowTester.VerifyTable( - models.GithubJob{}, - "./snapshot_tables/_tool_github_jobs.csv", - []string{ - "connection_id", - "repo_id", - "id", - "run_id", - "run_url", - "node_id", - "head_sha", - "url", - "status", - "conclusion", - "started_at", - "completed_at", - "name", - "steps", - "check_run_url", - "labels", - "runner_id", - "runner_name", - "runner_group_id", - "type", - - "_raw_data_params", - "_raw_data_table", - "_raw_data_id", - "_raw_data_remark", - }, - ) - - dataflowTester.Subtask(tasks.ConvertTasksMeta, taskData) - dataflowTester.VerifyTable( - devops.CICDTask{}, - "./snapshot_tables/cicd_tasks.csv", - []string{ - "name", - "pipeline_id", - "result", - "status", - "type", - "duration_sec", - "started_date", - "finished_date", - }, - ) -} - -func TestGithubRunsDataFlow(t *testing.T) { - +func TestGithubCICDDataFlow(t *testing.T) { var github impl.Github dataflowTester := e2ehelper.NewDataFlowTester(t, "github", github) @@ -191,7 +117,64 @@ func TestGithubRunsDataFlow(t *testing.T) { "pipeline_id", "commit_sha", "branch", - "repo", + "repo_id", + "repo_url", + }, + ) + + // import raw data table + // SELECT * FROM _raw_github_api_jobs INTO OUTFILE "/tmp/_raw_github_api_jobs.csv" FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\r\n'; + dataflowTester.ImportCsvIntoRawTable("./raw_tables/_raw_github_api_jobs.csv", "_raw_github_api_jobs") + + // verify extraction + dataflowTester.FlushTabler(&models.GithubJob{}) + dataflowTester.FlushTabler(&devops.CICDTask{}) + + dataflowTester.Subtask(tasks.ExtractJobsMeta, taskData) + dataflowTester.VerifyTable( + models.GithubJob{}, + "./snapshot_tables/_tool_github_jobs.csv", + []string{ + "connection_id", + "repo_id", + "id", + "run_id", + "run_url", + "node_id", + "head_sha", + "url", + "status", + "conclusion", + "started_at", + "completed_at", + "name", + "steps", + "check_run_url", + "labels", + "runner_id", + "runner_name", + "runner_group_id", + "type", + "_raw_data_params", + "_raw_data_table", + "_raw_data_id", + "_raw_data_remark", + }, + ) + + dataflowTester.Subtask(tasks.ConvertTasksMeta, taskData) + dataflowTester.VerifyTable( + devops.CICDTask{}, + "./snapshot_tables/cicd_tasks.csv", + []string{ + "name", + "pipeline_id", + "result", + "status", + "type", + "duration_sec", + "started_date", + "finished_date", }, ) } diff --git a/plugins/github/e2e/snapshot_tables/cicd_pipeline_commits.csv b/plugins/github/e2e/snapshot_tables/cicd_pipeline_commits.csv index 6b1463f1..4356de9d 100644 --- a/plugins/github/e2e/snapshot_tables/cicd_pipeline_commits.csv +++ b/plugins/github/e2e/snapshot_tables/cicd_pipeline_commits.csv @@ -1,98 +1,98 @@ -pipeline_id,commit_sha,branch,repo -github:GithubRun:1:1510490015,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1510490016,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1510490017,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1538144096,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1566272785,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1595162148,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1621008599,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1642642803,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1670481057,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1671012485,1b95a084ac08cd34e247b5d3d0063778cfc14748,add_binarysearch_of_loop_q,github:GithubRepo:1:134018330 -github:GithubRun:1:1671012486,1b95a084ac08cd34e247b5d3d0063778cfc14748,add_binarysearch_of_loop_q,github:GithubRepo:1:134018330 -github:GithubRun:1:1671012489,1b95a084ac08cd34e247b5d3d0063778cfc14748,add_binarysearch_of_loop_q,github:GithubRepo:1:134018330 -github:GithubRun:1:1700729209,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1732056958,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1764901182,f85be55586a63c483c38c5ee5148460ec8301abb,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1765240396,0bc4eb314e41fc0deb47a617dd1e76d2ab20c3a7,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1765240397,0bc4eb314e41fc0deb47a617dd1e76d2ab20c3a7,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1765240399,0bc4eb314e41fc0deb47a617dd1e76d2ab20c3a7,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1770578332,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1770578333,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1770578335,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1798456849,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1806210136,d022f422f61e7f355a43b69d23a279cd8524a55c,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1806210139,d022f422f61e7f355a43b69d23a279cd8524a55c,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1806210142,d022f422f61e7f355a43b69d23a279cd8524a55c,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1810596639,8d03fcf77f75c5c2a5b4cfc98e2ec9978af07593,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1810596640,8d03fcf77f75c5c2a5b4cfc98e2ec9978af07593,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1810596641,8d03fcf77f75c5c2a5b4cfc98e2ec9978af07593,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1810600610,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1810600611,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1810600613,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1812264576,2be767dc74bfa68412b1ef274a42d8829b4dbca8,simpler-pool-func,github:GithubRepo:1:134018330 -github:GithubRun:1:1812264578,2be767dc74bfa68412b1ef274a42d8829b4dbca8,simpler-pool-func,github:GithubRepo:1:134018330 -github:GithubRun:1:1812264584,2be767dc74bfa68412b1ef274a42d8829b4dbca8,simpler-pool-func,github:GithubRepo:1:134018330 -github:GithubRun:1:1816294263,f9310f1d1cf5e3ddb2bf6e24074250eed11bd03d,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1816294265,f9310f1d1cf5e3ddb2bf6e24074250eed11bd03d,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1816294269,f9310f1d1cf5e3ddb2bf6e24074250eed11bd03d,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1832817740,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1840663990,0e17530397bcec737dd9a77fc9589a6866ec4f6e,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1840663991,0e17530397bcec737dd9a77fc9589a6866ec4f6e,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1840663993,0e17530397bcec737dd9a77fc9589a6866ec4f6e,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330 -github:GithubRun:1:1841409038,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1841409040,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1841409048,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1867842066,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1902128007,134f354e8e3ba73a35bc7da671ea6d1a8001d35d,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1937158166,134f354e8e3ba73a35bc7da671ea6d1a8001d35d,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1950331010,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1950331011,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1950331019,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:1972322397,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2007670039,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2043519651,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2081030401,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2139522011,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2175621127,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2211310588,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2248995623,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2282334133,eedcecdf4a7e628fb50862a33f51893dddd3a188,test,github:GithubRepo:1:134018330 -github:GithubRun:1:2282334134,eedcecdf4a7e628fb50862a33f51893dddd3a188,test,github:GithubRepo:1:134018330 -github:GithubRun:1:2282334135,eedcecdf4a7e628fb50862a33f51893dddd3a188,test,github:GithubRepo:1:134018330 -github:GithubRun:1:2282376171,eedcecdf4a7e628fb50862a33f51893dddd3a188,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2282376176,eedcecdf4a7e628fb50862a33f51893dddd3a188,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2282376177,eedcecdf4a7e628fb50862a33f51893dddd3a188,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2282497585,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2282497589,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2282497593,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2285329812,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2286692492,9310acdff2ced5a835ac3ea94206c43b6708c3d3,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2286692493,9310acdff2ced5a835ac3ea94206c43b6708c3d3,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2286692494,9310acdff2ced5a835ac3ea94206c43b6708c3d3,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2323022643,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2361997480,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2400008940,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2438503618,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2478834057,f85611741eb1f5451697ac589008d28f240887fc,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2519305981,f85611741eb1f5451697ac589008d28f240887fc,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2559400712,5dd23ddff8621e6ae36eb24b20d4c4a06dd73dc9,Fix_rm_redundancy_code,github:GithubRepo:1:134018330 -github:GithubRun:1:2559400713,5dd23ddff8621e6ae36eb24b20d4c4a06dd73dc9,Fix_rm_redundancy_code,github:GithubRepo:1:134018330 -github:GithubRun:1:2559400714,5dd23ddff8621e6ae36eb24b20d4c4a06dd73dc9,Fix_rm_redundancy_code,github:GithubRepo:1:134018330 -github:GithubRun:1:2559507315,f85611741eb1f5451697ac589008d28f240887fc,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2566218975,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2566218976,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2566218977,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2589885628,fa938334e73faf88a15b59622ab1da61a643c5da,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2589885635,fa938334e73faf88a15b59622ab1da61a643c5da,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2589885639,fa938334e73faf88a15b59622ab1da61a643c5da,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2600408985,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2639945362,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2680721264,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2722539966,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2764660507,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2807709308,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2850801364,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2893573709,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2938072864,06e6934c35c336b1a2bd3005fb21dc3914a45747,master,github:GithubRepo:1:134018330 -github:GithubRun:1:2983238245,06e6934c35c336b1a2bd3005fb21dc3914a45747,master,github:GithubRepo:1:134018330 +pipeline_id,commit_sha,branch,repo_id,repo_url +github:GithubRun:1:1510490015,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1510490016,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1510490017,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1538144096,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1566272785,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1595162148,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1621008599,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1642642803,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1670481057,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1671012485,1b95a084ac08cd34e247b5d3d0063778cfc14748,add_binarysearch_of_loop_q,github:GithubRepo:1:134018330, +github:GithubRun:1:1671012486,1b95a084ac08cd34e247b5d3d0063778cfc14748,add_binarysearch_of_loop_q,github:GithubRepo:1:134018330, +github:GithubRun:1:1671012489,1b95a084ac08cd34e247b5d3d0063778cfc14748,add_binarysearch_of_loop_q,github:GithubRepo:1:134018330, +github:GithubRun:1:1700729209,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1732056958,1e897421860606afc3d1304cafe5cd187cee13e9,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1764901182,f85be55586a63c483c38c5ee5148460ec8301abb,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1765240396,0bc4eb314e41fc0deb47a617dd1e76d2ab20c3a7,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1765240397,0bc4eb314e41fc0deb47a617dd1e76d2ab20c3a7,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1765240399,0bc4eb314e41fc0deb47a617dd1e76d2ab20c3a7,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1770578332,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1770578333,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1770578335,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1798456849,1bd4304727b2ea62ec243f3145389d6ffe3607cf,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1806210136,d022f422f61e7f355a43b69d23a279cd8524a55c,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1806210139,d022f422f61e7f355a43b69d23a279cd8524a55c,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1806210142,d022f422f61e7f355a43b69d23a279cd8524a55c,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1810596639,8d03fcf77f75c5c2a5b4cfc98e2ec9978af07593,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1810596640,8d03fcf77f75c5c2a5b4cfc98e2ec9978af07593,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1810596641,8d03fcf77f75c5c2a5b4cfc98e2ec9978af07593,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1810600610,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1810600611,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1810600613,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1812264576,2be767dc74bfa68412b1ef274a42d8829b4dbca8,simpler-pool-func,github:GithubRepo:1:134018330, +github:GithubRun:1:1812264578,2be767dc74bfa68412b1ef274a42d8829b4dbca8,simpler-pool-func,github:GithubRepo:1:134018330, +github:GithubRun:1:1812264584,2be767dc74bfa68412b1ef274a42d8829b4dbca8,simpler-pool-func,github:GithubRepo:1:134018330, +github:GithubRun:1:1816294263,f9310f1d1cf5e3ddb2bf6e24074250eed11bd03d,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1816294265,f9310f1d1cf5e3ddb2bf6e24074250eed11bd03d,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1816294269,f9310f1d1cf5e3ddb2bf6e24074250eed11bd03d,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1832817740,0fa2fd6dc1811f81026a252854f4a8c0471ac7b0,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1840663990,0e17530397bcec737dd9a77fc9589a6866ec4f6e,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1840663991,0e17530397bcec737dd9a77fc9589a6866ec4f6e,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1840663993,0e17530397bcec737dd9a77fc9589a6866ec4f6e,feat/instantly-scale-up-capacity,github:GithubRepo:1:134018330, +github:GithubRun:1:1841409038,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1841409040,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1841409048,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1867842066,fbd17036dbf5ae677ba9e41326745a65e655232f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1902128007,134f354e8e3ba73a35bc7da671ea6d1a8001d35d,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1937158166,134f354e8e3ba73a35bc7da671ea6d1a8001d35d,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1950331010,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1950331011,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1950331019,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:1972322397,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2007670039,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2043519651,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2081030401,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2139522011,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2175621127,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2211310588,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2248995623,96d074234a612a15078f25cf2f156f833ff3182f,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2282334133,eedcecdf4a7e628fb50862a33f51893dddd3a188,test,github:GithubRepo:1:134018330, +github:GithubRun:1:2282334134,eedcecdf4a7e628fb50862a33f51893dddd3a188,test,github:GithubRepo:1:134018330, +github:GithubRun:1:2282334135,eedcecdf4a7e628fb50862a33f51893dddd3a188,test,github:GithubRepo:1:134018330, +github:GithubRun:1:2282376171,eedcecdf4a7e628fb50862a33f51893dddd3a188,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2282376176,eedcecdf4a7e628fb50862a33f51893dddd3a188,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2282376177,eedcecdf4a7e628fb50862a33f51893dddd3a188,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2282497585,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2282497589,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2282497593,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2285329812,607d0390c6c63ad4d934da39a90a18dc62f4857b,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2286692492,9310acdff2ced5a835ac3ea94206c43b6708c3d3,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2286692493,9310acdff2ced5a835ac3ea94206c43b6708c3d3,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2286692494,9310acdff2ced5a835ac3ea94206c43b6708c3d3,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2323022643,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2361997480,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2400008940,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2438503618,a35b88d90635cc1729ea566eaef0e57d80585c1c,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2478834057,f85611741eb1f5451697ac589008d28f240887fc,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2519305981,f85611741eb1f5451697ac589008d28f240887fc,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2559400712,5dd23ddff8621e6ae36eb24b20d4c4a06dd73dc9,Fix_rm_redundancy_code,github:GithubRepo:1:134018330, +github:GithubRun:1:2559400713,5dd23ddff8621e6ae36eb24b20d4c4a06dd73dc9,Fix_rm_redundancy_code,github:GithubRepo:1:134018330, +github:GithubRun:1:2559400714,5dd23ddff8621e6ae36eb24b20d4c4a06dd73dc9,Fix_rm_redundancy_code,github:GithubRepo:1:134018330, +github:GithubRun:1:2559507315,f85611741eb1f5451697ac589008d28f240887fc,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2566218975,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2566218976,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2566218977,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2589885628,fa938334e73faf88a15b59622ab1da61a643c5da,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2589885635,fa938334e73faf88a15b59622ab1da61a643c5da,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2589885639,fa938334e73faf88a15b59622ab1da61a643c5da,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2600408985,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2639945362,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2680721264,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2722539966,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2764660507,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2807709308,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2850801364,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2893573709,32664cb1408f8d9ffa7236335025a4cd94a306ce,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2938072864,06e6934c35c336b1a2bd3005fb21dc3914a45747,master,github:GithubRepo:1:134018330, +github:GithubRun:1:2983238245,06e6934c35c336b1a2bd3005fb21dc3914a45747,master,github:GithubRepo:1:134018330, diff --git a/plugins/github/tasks/cicd_pipeline_convertor.go b/plugins/github/tasks/cicd_pipeline_convertor.go index b67c3d59..58999cfa 100644 --- a/plugins/github/tasks/cicd_pipeline_convertor.go +++ b/plugins/github/tasks/cicd_pipeline_convertor.go @@ -97,7 +97,7 @@ func ConvertPipelines(taskCtx core.SubTaskContext) errors.Error { PipelineId: fmt.Sprintf("%s:%s:%d:%d", "github", "GithubRun", data.Options.ConnectionId, line.ID), CommitSha: line.HeadSha, Branch: line.HeadBranch, - Repo: didgen.NewDomainIdGenerator(&githubModels.GithubRepo{}).Generate(data.Options.ConnectionId, repoId), + RepoId: didgen.NewDomainIdGenerator(&githubModels.GithubRepo{}).Generate(data.Options.ConnectionId, repoId), } return []interface{}{ diff --git a/plugins/gitlab/e2e/pipelines_test.go b/plugins/gitlab/e2e/pipelines_test.go index 1a5c7acf..3609dd09 100644 --- a/plugins/gitlab/e2e/pipelines_test.go +++ b/plugins/gitlab/e2e/pipelines_test.go @@ -109,7 +109,8 @@ func TestGitlabPipelineDataFlow(t *testing.T) { "pipeline_id", "commit_sha", "branch", - "repo", + "repo_id", + "repo_url", }, ) } diff --git a/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_commits.csv b/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_commits.csv index 5eb73e87..d34b65eb 100644 --- a/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_commits.csv +++ b/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_commits.csv @@ -1,21 +1,21 @@ -pipeline_id,commit_sha,branch,repo -gitlab:GitlabPipeline:1:457474837,b1b82852d48b516a18e56c5bab0ebf54b8f4ccfd,renovate/pin-dependencies,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:457474996,739ab912e6e1ed27cecd8a2d00bfd6fa52afd90a,renovate/jest-monorepo,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:457475160,44d127e0ab7dbc4bc259b55929c9d00b62fc3bf4,renovate/lodash-monorepo,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:457475337,10a6464b6bd2cf4b59b8ac37ce1466e013f5a20d,renovate/shx-0.x,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485811050,c791ea6949d6b4aadf79b15ba666cb690c6527ac,EE-7121,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485811059,c791ea6949d6b4aadf79b15ba666cb690c6527ac,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485813816,ecc7c0b2874c812ed882c9effbbda26e0abc7110,EE-7121,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485813830,ecc7c0b2874c812ed882c9effbbda26e0abc7110,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485814501,6a3346f8434cc65fbe3f7a80a0edec5b4014a733,EE-7121,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485814516,6a3346f8434cc65fbe3f7a80a0edec5b4014a733,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485814871,f731732471961fed061a01fa99631f69e861c4a2,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485817670,5b95c5aebce1eae6a1b95ecf6fbc870851455375,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485837602,a79e2aaeee9916338a11b665cb4201f24627f3f1,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485842553,9e0934cedcd83abab8d34c5bb0f597c7837a55f0,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485845850,b3b581940f6d4d3226db31e48eab2b3b73f4c6db,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485852752,82df93eeb72c71271dad5a85359f39661de899fe,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485865876,db45efd231dbaca1337bd29bc1f65f404754e6bd,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485877118,09f81b1b2d083411c0bfecd32d7728479b594503,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485905167,cce432655861efafcd05edc8de09e305c772d2b8,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 -gitlab:GitlabPipeline:1:485932863,12fc3a42080bb98ca520817bd4fe0ca33c0bb279,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678 +pipeline_id,commit_sha,branch,repo_id,repo_url +gitlab:GitlabPipeline:1:457474837,b1b82852d48b516a18e56c5bab0ebf54b8f4ccfd,renovate/pin-dependencies,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:457474996,739ab912e6e1ed27cecd8a2d00bfd6fa52afd90a,renovate/jest-monorepo,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:457475160,44d127e0ab7dbc4bc259b55929c9d00b62fc3bf4,renovate/lodash-monorepo,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:457475337,10a6464b6bd2cf4b59b8ac37ce1466e013f5a20d,renovate/shx-0.x,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485811050,c791ea6949d6b4aadf79b15ba666cb690c6527ac,EE-7121,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485811059,c791ea6949d6b4aadf79b15ba666cb690c6527ac,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485813816,ecc7c0b2874c812ed882c9effbbda26e0abc7110,EE-7121,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485813830,ecc7c0b2874c812ed882c9effbbda26e0abc7110,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485814501,6a3346f8434cc65fbe3f7a80a0edec5b4014a733,EE-7121,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485814516,6a3346f8434cc65fbe3f7a80a0edec5b4014a733,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485814871,f731732471961fed061a01fa99631f69e861c4a2,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485817670,5b95c5aebce1eae6a1b95ecf6fbc870851455375,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485837602,a79e2aaeee9916338a11b665cb4201f24627f3f1,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485842553,9e0934cedcd83abab8d34c5bb0f597c7837a55f0,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485845850,b3b581940f6d4d3226db31e48eab2b3b73f4c6db,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485852752,82df93eeb72c71271dad5a85359f39661de899fe,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485865876,db45efd231dbaca1337bd29bc1f65f404754e6bd,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485877118,09f81b1b2d083411c0bfecd32d7728479b594503,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485905167,cce432655861efafcd05edc8de09e305c772d2b8,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, +gitlab:GitlabPipeline:1:485932863,12fc3a42080bb98ca520817bd4fe0ca33c0bb279,refs/merge-requests/74/head,gitlab:GitlabProject:1:12345678, diff --git a/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv b/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv index 158b9ec8..9ed750b4 100644 --- a/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv +++ b/plugins/gitlab/e2e/snapshot_tables/cicd_pipelines.csv @@ -1,21 +1,21 @@ id,name,result,status,type,duration_sec,created_date,finished_date,environment -gitlab:GitlabPipeline:1:457474837,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-01-27T10:07:09.429+00:00,2022-01-27T10:07:09.553+00:00, -gitlab:GitlabPipeline:1:457474996,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-01-27T10:07:18.884+00:00,2022-01-27T10:07:19.043+00:00, -gitlab:GitlabPipeline:1:457475160,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-01-27T10:07:26.435+00:00,2022-01-27T10:07:26.638+00:00, -gitlab:GitlabPipeline:1:457475337,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,1,2022-01-27T10:07:36.502+00:00,2022-01-27T10:07:37.545+00:00, -gitlab:GitlabPipeline:1:485811050,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-03-07T06:26:42.109+00:00,2022-03-07T06:26:42.109+00:00, -gitlab:GitlabPipeline:1:485811059,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-03-07T06:26:43.784+00:00,2022-03-07T06:26:43.784+00:00, -gitlab:GitlabPipeline:1:485813816,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-03-07T06:33:56.824+00:00,2022-03-07T06:33:56.824+00:00, -gitlab:GitlabPipeline:1:485813830,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-03-07T06:33:58.889+00:00,2022-03-07T06:33:58.889+00:00, -gitlab:GitlabPipeline:1:485814501,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-03-07T06:35:28.111+00:00,2022-03-07T06:35:28.111+00:00, -gitlab:GitlabPipeline:1:485814516,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,0,2022-03-07T06:35:31.255+00:00,2022-03-07T06:35:31.255+00:00, -gitlab:GitlabPipeline:1:485814871,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,42,2022-03-07T06:36:50.020+00:00,2022-03-07T06:37:32.103+00:00, -gitlab:GitlabPipeline:1:485817670,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,1956,2022-03-07T06:45:09.471+00:00,2022-03-07T07:17:46.305+00:00, -gitlab:GitlabPipeline:1:485837602,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,434,2022-03-07T07:20:45.859+00:00,2022-03-07T07:28:00.277+00:00, -gitlab:GitlabPipeline:1:485842553,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,287,2022-03-07T07:30:47.018+00:00,2022-03-07T07:35:34.998+00:00, -gitlab:GitlabPipeline:1:485845850,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,419,2022-03-07T07:38:58.611+00:00,2022-03-07T07:45:58.412+00:00, -gitlab:GitlabPipeline:1:485852752,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,319,2022-03-07T07:46:09.385+00:00,2022-03-07T07:51:28.709+00:00, -gitlab:GitlabPipeline:1:485865876,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,480,2022-03-07T08:04:56.406+00:00,2022-03-07T08:12:56.453+00:00, -gitlab:GitlabPipeline:1:485877118,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,289,2022-03-07T08:22:48.943+00:00,2022-03-07T08:27:38.364+00:00, -gitlab:GitlabPipeline:1:485905167,gitlab:GitlabProject:1:0,FAILURE,DONE,CI/CD,687,2022-03-07T09:02:09.994+00:00,2022-03-07T09:13:37.013+00:00, -gitlab:GitlabPipeline:1:485932863,gitlab:GitlabProject:1:0,SUCCESS,DONE,CI/CD,398,2022-03-07T09:34:57.476+00:00,2022-03-07T09:41:36.267+00:00, +gitlab:GitlabPipeline:1:457474837,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-01-27T10:07:09.429+00:00,2022-01-27T10:07:09.553+00:00, +gitlab:GitlabPipeline:1:457474996,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-01-27T10:07:18.884+00:00,2022-01-27T10:07:19.043+00:00, +gitlab:GitlabPipeline:1:457475160,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-01-27T10:07:26.435+00:00,2022-01-27T10:07:26.638+00:00, +gitlab:GitlabPipeline:1:457475337,gitlab:GitlabProject:1:0,FAILURE,DONE,,1,2022-01-27T10:07:36.502+00:00,2022-01-27T10:07:37.545+00:00, +gitlab:GitlabPipeline:1:485811050,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-03-07T06:26:42.109+00:00,2022-03-07T06:26:42.109+00:00, +gitlab:GitlabPipeline:1:485811059,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-03-07T06:26:43.784+00:00,2022-03-07T06:26:43.784+00:00, +gitlab:GitlabPipeline:1:485813816,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-03-07T06:33:56.824+00:00,2022-03-07T06:33:56.824+00:00, +gitlab:GitlabPipeline:1:485813830,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-03-07T06:33:58.889+00:00,2022-03-07T06:33:58.889+00:00, +gitlab:GitlabPipeline:1:485814501,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-03-07T06:35:28.111+00:00,2022-03-07T06:35:28.111+00:00, +gitlab:GitlabPipeline:1:485814516,gitlab:GitlabProject:1:0,FAILURE,DONE,,0,2022-03-07T06:35:31.255+00:00,2022-03-07T06:35:31.255+00:00, +gitlab:GitlabPipeline:1:485814871,gitlab:GitlabProject:1:0,FAILURE,DONE,,42,2022-03-07T06:36:50.020+00:00,2022-03-07T06:37:32.103+00:00, +gitlab:GitlabPipeline:1:485817670,gitlab:GitlabProject:1:0,FAILURE,DONE,,1956,2022-03-07T06:45:09.471+00:00,2022-03-07T07:17:46.305+00:00, +gitlab:GitlabPipeline:1:485837602,gitlab:GitlabProject:1:0,FAILURE,DONE,,434,2022-03-07T07:20:45.859+00:00,2022-03-07T07:28:00.277+00:00, +gitlab:GitlabPipeline:1:485842553,gitlab:GitlabProject:1:0,FAILURE,DONE,,287,2022-03-07T07:30:47.018+00:00,2022-03-07T07:35:34.998+00:00, +gitlab:GitlabPipeline:1:485845850,gitlab:GitlabProject:1:0,FAILURE,DONE,,419,2022-03-07T07:38:58.611+00:00,2022-03-07T07:45:58.412+00:00, +gitlab:GitlabPipeline:1:485852752,gitlab:GitlabProject:1:0,FAILURE,DONE,,319,2022-03-07T07:46:09.385+00:00,2022-03-07T07:51:28.709+00:00, +gitlab:GitlabPipeline:1:485865876,gitlab:GitlabProject:1:0,FAILURE,DONE,,480,2022-03-07T08:04:56.406+00:00,2022-03-07T08:12:56.453+00:00, +gitlab:GitlabPipeline:1:485877118,gitlab:GitlabProject:1:0,FAILURE,DONE,,289,2022-03-07T08:22:48.943+00:00,2022-03-07T08:27:38.364+00:00, +gitlab:GitlabPipeline:1:485905167,gitlab:GitlabProject:1:0,FAILURE,DONE,,687,2022-03-07T09:02:09.994+00:00,2022-03-07T09:13:37.013+00:00, +gitlab:GitlabPipeline:1:485932863,gitlab:GitlabProject:1:0,SUCCESS,DONE,,398,2022-03-07T09:34:57.476+00:00,2022-03-07T09:41:36.267+00:00, diff --git a/plugins/gitlab/tasks/pipeline_convertor.go b/plugins/gitlab/tasks/pipeline_convertor.go index 6ab427c4..47c8c89f 100644 --- a/plugins/gitlab/tasks/pipeline_convertor.go +++ b/plugins/gitlab/tasks/pipeline_convertor.go @@ -85,7 +85,6 @@ func ConvertPipelines(taskCtx core.SubTaskContext) errors.Error { InProgress: []string{"created", "waiting_for_resource", "preparing", "pending", "running", "manual", "scheduled"}, Default: devops.DONE, }, gitlabPipeline.Status), - Type: "CI/CD", CreatedDate: createdAt, FinishedDate: gitlabPipeline.GitlabUpdatedAt, } diff --git a/plugins/gitlab/tasks/pipeline_project_convertor.go b/plugins/gitlab/tasks/pipeline_project_convertor.go index 650b5d05..eada51e5 100644 --- a/plugins/gitlab/tasks/pipeline_project_convertor.go +++ b/plugins/gitlab/tasks/pipeline_project_convertor.go @@ -66,7 +66,7 @@ func ConvertPipelineProjects(taskCtx core.SubTaskContext) errors.Error { PipelineId: pipelineIdGen.Generate(data.Options.ConnectionId, gitlabPipelineProject.PipelineId), CommitSha: gitlabPipelineProject.Sha, Branch: gitlabPipelineProject.Ref, - Repo: didgen.NewDomainIdGenerator(&gitlabModels.GitlabProject{}). + RepoId: didgen.NewDomainIdGenerator(&gitlabModels.GitlabProject{}). Generate(gitlabPipelineProject.ConnectionId, gitlabPipelineProject.ProjectId), } diff --git a/plugins/jenkins/e2e/builds_test.go b/plugins/jenkins/e2e/builds_test.go index 04757946..81978338 100644 --- a/plugins/jenkins/e2e/builds_test.go +++ b/plugins/jenkins/e2e/builds_test.go @@ -92,6 +92,7 @@ func TestJenkinsBuildsDataFlow(t *testing.T) { dataflowTester.FlushTabler(&devops.CICDPipelineRelationship{}) dataflowTester.Subtask(tasks.EnrichApiBuildWithStagesMeta, taskData) dataflowTester.Subtask(tasks.ConvertBuildsToCICDMeta, taskData) + dataflowTester.Subtask(tasks.ConvertBuildReposMeta, taskData) dataflowTester.VerifyTable( devops.CICDTask{}, @@ -138,7 +139,8 @@ func TestJenkinsBuildsDataFlow(t *testing.T) { "./snapshot_tables/cicd_pipeline_commits.csv", []string{ "pipeline_id", - "repo", + "repo_id", + "repo_url", "branch", "commit_sha", }, diff --git a/plugins/jenkins/e2e/snapshot_tables/cicd_pipeline_commits.csv b/plugins/jenkins/e2e/snapshot_tables/cicd_pipeline_commits.csv index 61561829..71dd0034 100644 --- a/plugins/jenkins/e2e/snapshot_tables/cicd_pipeline_commits.csv +++ b/plugins/jenkins/e2e/snapshot_tables/cicd_pipeline_commits.csv @@ -1 +1,9 @@ -pipeline_id,commit_sha,repo,branch +pipeline_id,commit_sha,repo_id,repo_url,branch +jenkins:JenkinsTask:1:devlake #1,ceeffdfdd06bce232f9adb3a656265bad13a8473,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main +jenkins:JenkinsTask:1:devlake #2,0f886c74949c3ee7e489188911c7dc0c1d547418,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main +jenkins:JenkinsTask:1:devlake #3,0f886c74949c3ee7e489188911c7dc0c1d547418,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main +jenkins:JenkinsTask:1:devlake #4,20139afef3c6ec9f3ebffcb06e243b145cbef8c6,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main +jenkins:JenkinsTask:1:devlake #5,20139afef3c6ec9f3ebffcb06e243b145cbef8c6,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main +jenkins:JenkinsTask:1:devlake #6,20139afef3c6ec9f3ebffcb06e243b145cbef8c6,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main +jenkins:JenkinsTask:1:devlake #7,0006e8105d70318aff5eeee38d405fa181a32aa0,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main +jenkins:JenkinsTask:1:devlake #8,0006e8105d70318aff5eeee38d405fa181a32aa0,,https://github.com/merico-dev/lake.git,refs/remotes/origin/main diff --git a/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv b/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv index fa0e6af3..3b3c105a 100644 --- a/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv +++ b/plugins/jenkins/e2e/snapshot_tables/cicd_pipelines.csv @@ -1,38 +1,38 @@ id,name,result,status,type,duration_sec,environment,created_date,finished_date -jenkins:JenkinsPipeline:1:devlake #1,devlake,SUCCESS,DONE,CI/CD,14,,2022-04-15T10:10:16.000+00:00,2022-04-15T10:10:30.000+00:00 -jenkins:JenkinsPipeline:1:devlake #2,devlake,SUCCESS,DONE,CI/CD,2,,2022-04-15T11:35:48.000+00:00,2022-04-15T11:35:50.000+00:00 -jenkins:JenkinsPipeline:1:devlake #3,devlake,SUCCESS,DONE,CI/CD,1,,2022-04-15T12:00:49.000+00:00,2022-04-15T12:00:50.000+00:00 -jenkins:JenkinsPipeline:1:devlake #4,devlake,SUCCESS,DONE,CI/CD,13,,2022-09-08T14:26:43.000+00:00,2022-09-08T14:26:56.000+00:00 -jenkins:JenkinsPipeline:1:devlake #5,devlake,SUCCESS,DONE,CI/CD,1,,2022-09-08T14:27:11.000+00:00,2022-09-08T14:27:12.000+00:00 -jenkins:JenkinsPipeline:1:devlake #6,devlake,SUCCESS,DONE,CI/CD,1,,2022-09-08T14:27:22.000+00:00,2022-09-08T14:27:23.000+00:00 -jenkins:JenkinsPipeline:1:devlake #7,devlake,SUCCESS,DONE,CI/CD,1,,2022-09-08T15:40:25.000+00:00,2022-09-08T15:40:26.000+00:00 -jenkins:JenkinsPipeline:1:devlake #8,devlake,SUCCESS,DONE,CI/CD,1,,2022-09-08T15:40:40.000+00:00,2022-09-08T15:40:41.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #1,free,SUCCESS,DONE,CI/CD,0,,2022-07-21T06:39:26.000+00:00,2022-07-21T06:39:26.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #2,free,SUCCESS,DONE,CI/CD,0,,2022-07-21T06:39:36.000+00:00,2022-07-21T06:39:36.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #3,free,SUCCESS,DONE,CI/CD,0,,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #1,free1,SUCCESS,DONE,CI/CD,0,,2022-07-21T06:50:40.000+00:00,2022-07-21T06:50:40.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #2,free1,SUCCESS,DONE,CI/CD,0,,2022-07-21T06:50:50.000+00:00,2022-07-21T06:50:50.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #3,free1,SUCCESS,DONE,CI/CD,0,,2022-07-21T06:50:55.000+00:00,2022-07-21T06:50:55.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #4,free1,SUCCESS,DONE,CI/CD,0,,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » pipeline-test #1,pipeline-test,SUCCESS,DONE,CI/CD,1,,2022-07-21T06:40:02.000+00:00,2022-07-21T06:40:03.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » pipeline-test #2,pipeline-test,SUCCESS,DONE,CI/CD,0,,2022-09-08T14:26:51.000+00:00,2022-09-08T14:26:51.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » testfile #1,testfile,SUCCESS,DONE,CI/CD,0,,2022-07-21T06:40:00.000+00:00,2022-07-21T06:40:00.000+00:00 -jenkins:JenkinsPipeline:1:dir-test » testfile #2,testfile,SUCCESS,DONE,CI/CD,0,,2022-09-08T14:26:52.000+00:00,2022-09-08T14:26:52.000+00:00 -jenkins:JenkinsPipeline:1:pipeline-test2 #1,pipeline-test2,SUCCESS,DONE,CI/CD,4,,2022-09-08T15:40:13.000+00:00,2022-09-08T15:40:17.000+00:00 -jenkins:JenkinsPipeline:1:pipeline-test2 #2,pipeline-test2,SUCCESS,DONE,CI/CD,0,,2022-09-08T15:40:33.000+00:00,2022-09-08T15:40:33.000+00:00 -jenkins:JenkinsPipeline:1:pipeline-test2 #3,pipeline-test2,SUCCESS,DONE,CI/CD,0,,2022-09-08T15:40:48.000+00:00,2022-09-08T15:40:48.000+00:00 -jenkins:JenkinsPipeline:1:测试流水线 #1,测试流水线,SUCCESS,DONE,CI/CD,1,,2022-09-08T14:26:45.000+00:00,2022-09-08T14:26:46.000+00:00 -jenkins:JenkinsPipeline:1:测试流水线 #2,测试流水线,SUCCESS,DONE,CI/CD,0,,2022-09-08T14:27:12.000+00:00,2022-09-08T14:27:12.000+00:00 -jenkins:JenkinsPipeline:1:测试流水线 #3,测试流水线,SUCCESS,DONE,CI/CD,0,,2022-09-08T15:40:49.000+00:00,2022-09-08T15:40:49.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #1,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T10:05:53.000+00:00,2022-04-15T10:05:53.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #10,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-09-08T14:27:13.000+00:00,2022-09-08T14:27:13.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #11,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-09-08T15:40:56.000+00:00,2022-09-08T15:40:56.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #12,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-09-08T15:40:57.000+00:00,2022-09-08T15:40:57.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T10:06:17.000+00:00,2022-04-15T10:06:17.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #3,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T10:06:26.000+00:00,2022-04-15T10:06:26.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #4,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T11:35:56.000+00:00,2022-04-15T11:35:56.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #5,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T11:35:58.000+00:00,2022-04-15T11:35:58.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #6,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T11:36:00.000+00:00,2022-04-15T11:36:00.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #7,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T11:58:03.000+00:00,2022-04-15T11:58:03.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #8,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-04-15T11:58:14.000+00:00,2022-04-15T11:58:14.000+00:00 -jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #9,这是一个改了名字的测试任务,SUCCESS,DONE,CI/CD,0,,2022-09-08T14:26:47.000+00:00,2022-09-08T14:26:47.000+00:00 +jenkins:JenkinsPipeline:1:devlake #1,devlake,SUCCESS,DONE,,14,,2022-04-15T10:10:16.000+00:00,2022-04-15T10:10:30.000+00:00 +jenkins:JenkinsPipeline:1:devlake #2,devlake,SUCCESS,DONE,,2,,2022-04-15T11:35:48.000+00:00,2022-04-15T11:35:50.000+00:00 +jenkins:JenkinsPipeline:1:devlake #3,devlake,SUCCESS,DONE,,1,,2022-04-15T12:00:49.000+00:00,2022-04-15T12:00:50.000+00:00 +jenkins:JenkinsPipeline:1:devlake #4,devlake,SUCCESS,DONE,,13,,2022-09-08T14:26:43.000+00:00,2022-09-08T14:26:56.000+00:00 +jenkins:JenkinsPipeline:1:devlake #5,devlake,SUCCESS,DONE,,1,,2022-09-08T14:27:11.000+00:00,2022-09-08T14:27:12.000+00:00 +jenkins:JenkinsPipeline:1:devlake #6,devlake,SUCCESS,DONE,,1,,2022-09-08T14:27:22.000+00:00,2022-09-08T14:27:23.000+00:00 +jenkins:JenkinsPipeline:1:devlake #7,devlake,SUCCESS,DONE,,1,,2022-09-08T15:40:25.000+00:00,2022-09-08T15:40:26.000+00:00 +jenkins:JenkinsPipeline:1:devlake #8,devlake,SUCCESS,DONE,,1,,2022-09-08T15:40:40.000+00:00,2022-09-08T15:40:41.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #1,free,SUCCESS,DONE,,0,,2022-07-21T06:39:26.000+00:00,2022-07-21T06:39:26.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #2,free,SUCCESS,DONE,,0,,2022-07-21T06:39:36.000+00:00,2022-07-21T06:39:36.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #3,free,SUCCESS,DONE,,0,,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #1,free1,SUCCESS,DONE,,0,,2022-07-21T06:50:40.000+00:00,2022-07-21T06:50:40.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #2,free1,SUCCESS,DONE,,0,,2022-07-21T06:50:50.000+00:00,2022-07-21T06:50:50.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #3,free1,SUCCESS,DONE,,0,,2022-07-21T06:50:55.000+00:00,2022-07-21T06:50:55.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #4,free1,SUCCESS,DONE,,0,,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » pipeline-test #1,pipeline-test,SUCCESS,DONE,,1,,2022-07-21T06:40:02.000+00:00,2022-07-21T06:40:03.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » pipeline-test #2,pipeline-test,SUCCESS,DONE,,0,,2022-09-08T14:26:51.000+00:00,2022-09-08T14:26:51.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » testfile #1,testfile,SUCCESS,DONE,,0,,2022-07-21T06:40:00.000+00:00,2022-07-21T06:40:00.000+00:00 +jenkins:JenkinsPipeline:1:dir-test » testfile #2,testfile,SUCCESS,DONE,,0,,2022-09-08T14:26:52.000+00:00,2022-09-08T14:26:52.000+00:00 +jenkins:JenkinsPipeline:1:pipeline-test2 #1,pipeline-test2,SUCCESS,DONE,,4,,2022-09-08T15:40:13.000+00:00,2022-09-08T15:40:17.000+00:00 +jenkins:JenkinsPipeline:1:pipeline-test2 #2,pipeline-test2,SUCCESS,DONE,,0,,2022-09-08T15:40:33.000+00:00,2022-09-08T15:40:33.000+00:00 +jenkins:JenkinsPipeline:1:pipeline-test2 #3,pipeline-test2,SUCCESS,DONE,,0,,2022-09-08T15:40:48.000+00:00,2022-09-08T15:40:48.000+00:00 +jenkins:JenkinsPipeline:1:测试流水线 #1,测试流水线,SUCCESS,DONE,,1,,2022-09-08T14:26:45.000+00:00,2022-09-08T14:26:46.000+00:00 +jenkins:JenkinsPipeline:1:测试流水线 #2,测试流水线,SUCCESS,DONE,,0,,2022-09-08T14:27:12.000+00:00,2022-09-08T14:27:12.000+00:00 +jenkins:JenkinsPipeline:1:测试流水线 #3,测试流水线,SUCCESS,DONE,,0,,2022-09-08T15:40:49.000+00:00,2022-09-08T15:40:49.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #1,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T10:05:53.000+00:00,2022-04-15T10:05:53.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #10,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-09-08T14:27:13.000+00:00,2022-09-08T14:27:13.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #11,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-09-08T15:40:56.000+00:00,2022-09-08T15:40:56.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #12,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-09-08T15:40:57.000+00:00,2022-09-08T15:40:57.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T10:06:17.000+00:00,2022-04-15T10:06:17.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #3,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T10:06:26.000+00:00,2022-04-15T10:06:26.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #4,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T11:35:56.000+00:00,2022-04-15T11:35:56.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #5,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T11:35:58.000+00:00,2022-04-15T11:35:58.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #6,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T11:36:00.000+00:00,2022-04-15T11:36:00.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #7,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T11:58:03.000+00:00,2022-04-15T11:58:03.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #8,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-04-15T11:58:14.000+00:00,2022-04-15T11:58:14.000+00:00 +jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #9,这是一个改了名字的测试任务,SUCCESS,DONE,,0,,2022-09-08T14:26:47.000+00:00,2022-09-08T14:26:47.000+00:00 diff --git a/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv b/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv index a9353102..bad13e28 100644 --- a/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv +++ b/plugins/jenkins/e2e/snapshot_tables/cicd_tasks.csv @@ -1,38 +1,38 @@ id,name,pipeline_id,result,status,type,environment,duration_sec,started_date,finished_date -jenkins:JenkinsTask:1:devlake #1,devlake,jenkins:JenkinsPipeline:1:devlake #1,SUCCESS,DONE,CI/CD,,14,2022-04-15T10:10:16.000+00:00,2022-04-15T10:10:30.000+00:00 -jenkins:JenkinsTask:1:devlake #2,devlake,jenkins:JenkinsPipeline:1:devlake #2,SUCCESS,DONE,CI/CD,,2,2022-04-15T11:35:48.000+00:00,2022-04-15T11:35:50.000+00:00 -jenkins:JenkinsTask:1:devlake #3,devlake,jenkins:JenkinsPipeline:1:devlake #3,SUCCESS,DONE,CI/CD,,1,2022-04-15T12:00:49.000+00:00,2022-04-15T12:00:50.000+00:00 -jenkins:JenkinsTask:1:devlake #4,devlake,jenkins:JenkinsPipeline:1:devlake #4,SUCCESS,DONE,CI/CD,,13,2022-09-08T14:26:43.000+00:00,2022-09-08T14:26:56.000+00:00 -jenkins:JenkinsTask:1:devlake #5,devlake,jenkins:JenkinsPipeline:1:devlake #5,SUCCESS,DONE,CI/CD,,1,2022-09-08T14:27:11.000+00:00,2022-09-08T14:27:12.000+00:00 -jenkins:JenkinsTask:1:devlake #6,devlake,jenkins:JenkinsPipeline:1:devlake #6,SUCCESS,DONE,CI/CD,,1,2022-09-08T14:27:22.000+00:00,2022-09-08T14:27:23.000+00:00 -jenkins:JenkinsTask:1:devlake #7,devlake,jenkins:JenkinsPipeline:1:devlake #7,SUCCESS,DONE,CI/CD,,1,2022-09-08T15:40:25.000+00:00,2022-09-08T15:40:26.000+00:00 -jenkins:JenkinsTask:1:devlake #8,devlake,jenkins:JenkinsPipeline:1:devlake #8,SUCCESS,DONE,CI/CD,,1,2022-09-08T15:40:40.000+00:00,2022-09-08T15:40:41.000+00:00 -jenkins:JenkinsTask:1:dir-test » dir-test-2 » free #1,free,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #1,SUCCESS,DONE,CI/CD,,0,2022-07-21T06:39:26.000+00:00,2022-07-21T06:39:26.000+00:00 -jenkins:JenkinsTask:1:dir-test » dir-test-2 » free #2,free,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #2,SUCCESS,DONE,CI/CD,,0,2022-07-21T06:39:36.000+00:00,2022-07-21T06:39:36.000+00:00 -jenkins:JenkinsTask:1:dir-test » dir-test-2 » free #3,free,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #3,SUCCESS,DONE,CI/CD,,0,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 -jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #1,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #1,SUCCESS,DONE,CI/CD,,0,2022-07-21T06:50:40.000+00:00,2022-07-21T06:50:40.000+00:00 -jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #2,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #2,SUCCESS,DONE,CI/CD,,0,2022-07-21T06:50:50.000+00:00,2022-07-21T06:50:50.000+00:00 -jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #3,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #3,SUCCESS,DONE,CI/CD,,0,2022-07-21T06:50:55.000+00:00,2022-07-21T06:50:55.000+00:00 -jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #4,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #4,SUCCESS,DONE,CI/CD,,0,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 -jenkins:JenkinsTask:1:dir-test » pipeline-test #1,pipeline-test,jenkins:JenkinsPipeline:1:dir-test » pipeline-test #1,SUCCESS,DONE,CI/CD,,1,2022-07-21T06:40:02.000+00:00,2022-07-21T06:40:03.000+00:00 -jenkins:JenkinsTask:1:dir-test » pipeline-test #2,pipeline-test,jenkins:JenkinsPipeline:1:dir-test » pipeline-test #2,SUCCESS,DONE,CI/CD,,0,2022-09-08T14:26:51.000+00:00,2022-09-08T14:26:51.000+00:00 -jenkins:JenkinsTask:1:dir-test » testfile #1,testfile,jenkins:JenkinsPipeline:1:dir-test » testfile #1,SUCCESS,DONE,CI/CD,,0,2022-07-21T06:40:00.000+00:00,2022-07-21T06:40:00.000+00:00 -jenkins:JenkinsTask:1:dir-test » testfile #2,testfile,jenkins:JenkinsPipeline:1:dir-test » testfile #2,SUCCESS,DONE,CI/CD,,0,2022-09-08T14:26:52.000+00:00,2022-09-08T14:26:52.000+00:00 -jenkins:JenkinsTask:1:pipeline-test2 #1,pipeline-test2,jenkins:JenkinsPipeline:1:pipeline-test2 #1,SUCCESS,DONE,CI/CD,,4,2022-09-08T15:40:13.000+00:00,2022-09-08T15:40:17.000+00:00 -jenkins:JenkinsTask:1:pipeline-test2 #2,pipeline-test2,jenkins:JenkinsPipeline:1:pipeline-test2 #2,SUCCESS,DONE,CI/CD,,0,2022-09-08T15:40:33.000+00:00,2022-09-08T15:40:33.000+00:00 -jenkins:JenkinsTask:1:pipeline-test2 #3,pipeline-test2,jenkins:JenkinsPipeline:1:pipeline-test2 #3,SUCCESS,DONE,CI/CD,,0,2022-09-08T15:40:48.000+00:00,2022-09-08T15:40:48.000+00:00 -jenkins:JenkinsTask:1:测试流水线 #1,测试流水线,jenkins:JenkinsPipeline:1:测试流水线 #1,SUCCESS,DONE,CI/CD,,1,2022-09-08T14:26:45.000+00:00,2022-09-08T14:26:46.000+00:00 -jenkins:JenkinsTask:1:测试流水线 #2,测试流水线,jenkins:JenkinsPipeline:1:测试流水线 #2,SUCCESS,DONE,CI/CD,,0,2022-09-08T14:27:12.000+00:00,2022-09-08T14:27:12.000+00:00 -jenkins:JenkinsTask:1:测试流水线 #3,测试流水线,jenkins:JenkinsPipeline:1:测试流水线 #3,SUCCESS,DONE,CI/CD,,0,2022-09-08T15:40:49.000+00:00,2022-09-08T15:40:49.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #1,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #1,SUCCESS,DONE,CI/CD,,0,2022-04-15T10:05:53.000+00:00,2022-04-15T10:05:53.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #10,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #10,SUCCESS,DONE,CI/CD,,0,2022-09-08T14:27:13.000+00:00,2022-09-08T14:27:13.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #11,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #11,SUCCESS,DONE,CI/CD,,0,2022-09-08T15:40:56.000+00:00,2022-09-08T15:40:56.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #12,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #12,SUCCESS,DONE,CI/CD,,0,2022-09-08T15:40:57.000+00:00,2022-09-08T15:40:57.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #2,SUCCESS,DONE,CI/CD,,0,2022-04-15T10:06:17.000+00:00,2022-04-15T10:06:17.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #3,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #3,SUCCESS,DONE,CI/CD,,0,2022-04-15T10:06:26.000+00:00,2022-04-15T10:06:26.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #4,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #4,SUCCESS,DONE,CI/CD,,0,2022-04-15T11:35:56.000+00:00,2022-04-15T11:35:56.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #5,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #5,SUCCESS,DONE,CI/CD,,0,2022-04-15T11:35:58.000+00:00,2022-04-15T11:35:58.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #6,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #6,SUCCESS,DONE,CI/CD,,0,2022-04-15T11:36:00.000+00:00,2022-04-15T11:36:00.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #7,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #7,SUCCESS,DONE,CI/CD,,0,2022-04-15T11:58:03.000+00:00,2022-04-15T11:58:03.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #8,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #8,SUCCESS,DONE,CI/CD,,0,2022-04-15T11:58:14.000+00:00,2022-04-15T11:58:14.000+00:00 -jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #9,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #9,SUCCESS,DONE,CI/CD,,0,2022-09-08T14:26:47.000+00:00,2022-09-08T14:26:47.000+00:00 +jenkins:JenkinsTask:1:devlake #1,devlake,jenkins:JenkinsPipeline:1:devlake #1,SUCCESS,DONE,,,14,2022-04-15T10:10:16.000+00:00,2022-04-15T10:10:30.000+00:00 +jenkins:JenkinsTask:1:devlake #2,devlake,jenkins:JenkinsPipeline:1:devlake #2,SUCCESS,DONE,,,2,2022-04-15T11:35:48.000+00:00,2022-04-15T11:35:50.000+00:00 +jenkins:JenkinsTask:1:devlake #3,devlake,jenkins:JenkinsPipeline:1:devlake #3,SUCCESS,DONE,,,1,2022-04-15T12:00:49.000+00:00,2022-04-15T12:00:50.000+00:00 +jenkins:JenkinsTask:1:devlake #4,devlake,jenkins:JenkinsPipeline:1:devlake #4,SUCCESS,DONE,,,13,2022-09-08T14:26:43.000+00:00,2022-09-08T14:26:56.000+00:00 +jenkins:JenkinsTask:1:devlake #5,devlake,jenkins:JenkinsPipeline:1:devlake #5,SUCCESS,DONE,,,1,2022-09-08T14:27:11.000+00:00,2022-09-08T14:27:12.000+00:00 +jenkins:JenkinsTask:1:devlake #6,devlake,jenkins:JenkinsPipeline:1:devlake #6,SUCCESS,DONE,,,1,2022-09-08T14:27:22.000+00:00,2022-09-08T14:27:23.000+00:00 +jenkins:JenkinsTask:1:devlake #7,devlake,jenkins:JenkinsPipeline:1:devlake #7,SUCCESS,DONE,,,1,2022-09-08T15:40:25.000+00:00,2022-09-08T15:40:26.000+00:00 +jenkins:JenkinsTask:1:devlake #8,devlake,jenkins:JenkinsPipeline:1:devlake #8,SUCCESS,DONE,,,1,2022-09-08T15:40:40.000+00:00,2022-09-08T15:40:41.000+00:00 +jenkins:JenkinsTask:1:dir-test » dir-test-2 » free #1,free,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #1,SUCCESS,DONE,,,0,2022-07-21T06:39:26.000+00:00,2022-07-21T06:39:26.000+00:00 +jenkins:JenkinsTask:1:dir-test » dir-test-2 » free #2,free,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #2,SUCCESS,DONE,,,0,2022-07-21T06:39:36.000+00:00,2022-07-21T06:39:36.000+00:00 +jenkins:JenkinsTask:1:dir-test » dir-test-2 » free #3,free,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free #3,SUCCESS,DONE,,,0,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 +jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #1,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #1,SUCCESS,DONE,,,0,2022-07-21T06:50:40.000+00:00,2022-07-21T06:50:40.000+00:00 +jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #2,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #2,SUCCESS,DONE,,,0,2022-07-21T06:50:50.000+00:00,2022-07-21T06:50:50.000+00:00 +jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #3,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #3,SUCCESS,DONE,,,0,2022-07-21T06:50:55.000+00:00,2022-07-21T06:50:55.000+00:00 +jenkins:JenkinsTask:1:dir-test » dir-test-2 » free1 #4,free1,jenkins:JenkinsPipeline:1:dir-test » dir-test-2 » free1 #4,SUCCESS,DONE,,,0,2022-09-08T14:26:57.000+00:00,2022-09-08T14:26:57.000+00:00 +jenkins:JenkinsTask:1:dir-test » pipeline-test #1,pipeline-test,jenkins:JenkinsPipeline:1:dir-test » pipeline-test #1,SUCCESS,DONE,,,1,2022-07-21T06:40:02.000+00:00,2022-07-21T06:40:03.000+00:00 +jenkins:JenkinsTask:1:dir-test » pipeline-test #2,pipeline-test,jenkins:JenkinsPipeline:1:dir-test » pipeline-test #2,SUCCESS,DONE,,,0,2022-09-08T14:26:51.000+00:00,2022-09-08T14:26:51.000+00:00 +jenkins:JenkinsTask:1:dir-test » testfile #1,testfile,jenkins:JenkinsPipeline:1:dir-test » testfile #1,SUCCESS,DONE,,,0,2022-07-21T06:40:00.000+00:00,2022-07-21T06:40:00.000+00:00 +jenkins:JenkinsTask:1:dir-test » testfile #2,testfile,jenkins:JenkinsPipeline:1:dir-test » testfile #2,SUCCESS,DONE,,,0,2022-09-08T14:26:52.000+00:00,2022-09-08T14:26:52.000+00:00 +jenkins:JenkinsTask:1:pipeline-test2 #1,pipeline-test2,jenkins:JenkinsPipeline:1:pipeline-test2 #1,SUCCESS,DONE,,,4,2022-09-08T15:40:13.000+00:00,2022-09-08T15:40:17.000+00:00 +jenkins:JenkinsTask:1:pipeline-test2 #2,pipeline-test2,jenkins:JenkinsPipeline:1:pipeline-test2 #2,SUCCESS,DONE,,,0,2022-09-08T15:40:33.000+00:00,2022-09-08T15:40:33.000+00:00 +jenkins:JenkinsTask:1:pipeline-test2 #3,pipeline-test2,jenkins:JenkinsPipeline:1:pipeline-test2 #3,SUCCESS,DONE,,,0,2022-09-08T15:40:48.000+00:00,2022-09-08T15:40:48.000+00:00 +jenkins:JenkinsTask:1:测试流水线 #1,测试流水线,jenkins:JenkinsPipeline:1:测试流水线 #1,SUCCESS,DONE,,,1,2022-09-08T14:26:45.000+00:00,2022-09-08T14:26:46.000+00:00 +jenkins:JenkinsTask:1:测试流水线 #2,测试流水线,jenkins:JenkinsPipeline:1:测试流水线 #2,SUCCESS,DONE,,,0,2022-09-08T14:27:12.000+00:00,2022-09-08T14:27:12.000+00:00 +jenkins:JenkinsTask:1:测试流水线 #3,测试流水线,jenkins:JenkinsPipeline:1:测试流水线 #3,SUCCESS,DONE,,,0,2022-09-08T15:40:49.000+00:00,2022-09-08T15:40:49.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #1,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #1,SUCCESS,DONE,,,0,2022-04-15T10:05:53.000+00:00,2022-04-15T10:05:53.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #10,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #10,SUCCESS,DONE,,,0,2022-09-08T14:27:13.000+00:00,2022-09-08T14:27:13.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #11,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #11,SUCCESS,DONE,,,0,2022-09-08T15:40:56.000+00:00,2022-09-08T15:40:56.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #12,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #12,SUCCESS,DONE,,,0,2022-09-08T15:40:57.000+00:00,2022-09-08T15:40:57.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #2,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #2,SUCCESS,DONE,,,0,2022-04-15T10:06:17.000+00:00,2022-04-15T10:06:17.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #3,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #3,SUCCESS,DONE,,,0,2022-04-15T10:06:26.000+00:00,2022-04-15T10:06:26.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #4,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #4,SUCCESS,DONE,,,0,2022-04-15T11:35:56.000+00:00,2022-04-15T11:35:56.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #5,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #5,SUCCESS,DONE,,,0,2022-04-15T11:35:58.000+00:00,2022-04-15T11:35:58.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #6,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #6,SUCCESS,DONE,,,0,2022-04-15T11:36:00.000+00:00,2022-04-15T11:36:00.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #7,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #7,SUCCESS,DONE,,,0,2022-04-15T11:58:03.000+00:00,2022-04-15T11:58:03.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #8,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #8,SUCCESS,DONE,,,0,2022-04-15T11:58:14.000+00:00,2022-04-15T11:58:14.000+00:00 +jenkins:JenkinsTask:1:这是一个改了名字的测试任务 #9,这是一个改了名字的测试任务,jenkins:JenkinsPipeline:1:这是一个改了名字的测试任务 #9,SUCCESS,DONE,,,0,2022-09-08T14:26:47.000+00:00,2022-09-08T14:26:47.000+00:00 diff --git a/plugins/jenkins/tasks/build_cicd_convertor.go b/plugins/jenkins/tasks/build_cicd_convertor.go index b30040f8..97486132 100644 --- a/plugins/jenkins/tasks/build_cicd_convertor.go +++ b/plugins/jenkins/tasks/build_cicd_convertor.go @@ -94,7 +94,6 @@ func ConvertBuildsToCICD(taskCtx core.SubTaskContext) errors.Error { Result: jenkinsPipelineResult, Status: jenkinsPipelineStatus, FinishedDate: jenkinsPipelineFinishedDate, - Type: "CI/CD", DurationSec: uint64(durationSec), CreatedDate: jenkinsBuild.StartTime, } @@ -120,7 +119,6 @@ func ConvertBuildsToCICD(taskCtx core.SubTaskContext) errors.Error { Name: jenkinsBuild.JobName, Result: jenkinsPipelineResult, Status: jenkinsPipelineStatus, - Type: "CI/CD", DurationSec: uint64(durationSec), StartedDate: jenkinsBuild.StartTime, FinishedDate: jenkinsPipelineFinishedDate, diff --git a/plugins/jenkins/tasks/build_repo_convertor.go b/plugins/jenkins/tasks/build_repo_convertor.go index 54804337..ac0b68eb 100644 --- a/plugins/jenkins/tasks/build_repo_convertor.go +++ b/plugins/jenkins/tasks/build_repo_convertor.go @@ -69,7 +69,7 @@ func ConvertBuildRepos(taskCtx core.SubTaskContext) errors.Error { jenkinsBuildRepo.BuildName), CommitSha: jenkinsBuildRepo.CommitSha, Branch: jenkinsBuildRepo.Branch, - Repo: jenkinsBuildRepo.RepoUrl, + RepoUrl: jenkinsBuildRepo.RepoUrl, } return []interface{}{ build,
