This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 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 619b79e0 fix: hide some dora stage2 strategy and set environtment nil
(#3159)
619b79e0 is described below
commit 619b79e0fae8b3e07bc9bfe7e22bf6c36459a4f1
Author: abeizn <[email protected]>
AuthorDate: Thu Sep 22 09:59:00 2022 +0800
fix: hide some dora stage2 strategy and set environtment nil (#3159)
fix: hide some dora stage2 strategy and set environtment nil
---
plugins/dora/e2e/raw_tables/lake_cicd_tasks.csv | 6 ++--
.../dora/e2e/snapshot_tables/lake_cicd_tasks.csv | 32 +++++++++---------
plugins/dora/tasks/cicd_task_env_enricher.go | 38 ++++++++++++----------
3 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/plugins/dora/e2e/raw_tables/lake_cicd_tasks.csv
b/plugins/dora/e2e/raw_tables/lake_cicd_tasks.csv
index 51d50692..4ea2b348 100644
--- a/plugins/dora/e2e/raw_tables/lake_cicd_tasks.csv
+++ b/plugins/dora/e2e/raw_tables/lake_cicd_tasks.csv
@@ -1,14 +1,14 @@
id,created_at,updated_at,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,name,pipeline_id,result,status,type,duration_sec,started_date,finished_date,environment
-github:GithubJob:1:8269045794,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,2,"",lint,github:GithubRun:1:3022052551,FAILURE,DONE,"",72,2022-09-09
11:27:13,2022-09-09 11:28:25,""
+github:GithubJob:1:8269045794,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,2,"",deploy,github:GithubRun:1:3022052551,FAILURE,DONE,"",72,2022-09-09
11:27:13,2022-09-09 11:28:25,""
github:GithubJob:1:8269045795,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,3,"",test
(ubuntu-latest),github:GithubRun:1:3022052557,SUCCESS,DONE,"",191,2022-09-09
11:27:42,2022-09-09 11:30:53,""
github:GithubJob:1:8269045819,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,1,"",commit-msg,github:GithubRun:1:3022052555,SUCCESS,DONE,"",8,2022-09-09
11:26:38,2022-09-09 11:26:46,""
github:GithubJob:1:8269045928,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,4,"",e2e-mysql,github:GithubRun:1:3022052558,SUCCESS,DONE,"",200,2022-09-09
11:28:00,2022-09-09 11:31:20,""
github:GithubJob:1:8269046116,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,6,"",check
Apache license
header,github:GithubRun:1:3022052589,SUCCESS,DONE,"",57,2022-09-09
11:28:34,2022-09-09 11:29:31,""
-github:GithubJob:1:8269415129,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,5,"",lint,github:GithubRun:1:3022190519,FAILURE,DONE,"",84,2022-09-09
11:51:21,2022-09-09 11:52:45,""
+github:GithubJob:1:8269415129,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,5,"",deploy,github:GithubRun:1:3022190519,FAILURE,DONE,"",84,2022-09-09
11:51:21,2022-09-09 11:52:45,""
github:GithubJob:1:8269415130,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,9,"",test
(ubuntu-latest),github:GithubRun:1:3022190524,SUCCESS,DONE,"",182,2022-09-09
11:50:31,2022-09-09 11:53:33,""
github:GithubJob:1:8269415142,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,10,"",check
Apache license
header,github:GithubRun:1:3022190525,SUCCESS,DONE,"",63,2022-09-09
11:52:06,2022-09-09 11:53:09,""
github:GithubJob:1:8269415165,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,8,"",commit-msg,github:GithubRun:1:3022190521,SUCCESS,DONE,"",10,2022-09-09
11:52:46,2022-09-09 11:52:56,""
-github:GithubJob:1:8269415315,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,7,"",e2e-mysql,github:GithubRun:1:3022190520,SUCCESS,DONE,"",242,2022-09-09
11:53:45,2022-09-09 11:57:47,""
+github:GithubJob:1:8269415315,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,7,"",deployment,github:GithubRun:1:3022190520,SUCCESS,DONE,"",242,2022-09-09
11:53:45,2022-09-09 11:57:47,""
github:GithubJob:1:8269598312,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,14,"",e2e-mysql,github:GithubRun:1:3022255519,SUCCESS,DONE,"",828,2022-09-09
12:05:04,2022-09-09 12:18:52,""
github:GithubJob:1:8269598316,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,11,"",test
(ubuntu-latest),github:GithubRun:1:3022255511,SUCCESS,DONE,"",1016,2022-09-09
12:05:49,2022-09-09 12:22:45,""
github:GithubJob:1:8269598318,2022-09-15 03:20:03.867,2022-09-15
03:20:03.867,"{""ConnectionId"":1,""Owner"":""apache"",""Repo"":""incubator-devlake""}",_raw_github_api_jobs,12,"",lint,github:GithubRun:1:3022255516,FAILURE,DONE,"",62,2022-09-09
12:02:28,2022-09-09 12:03:30,""
diff --git a/plugins/dora/e2e/snapshot_tables/lake_cicd_tasks.csv
b/plugins/dora/e2e/snapshot_tables/lake_cicd_tasks.csv
index 023fe218..c2bfa418 100644
--- a/plugins/dora/e2e/snapshot_tables/lake_cicd_tasks.csv
+++ b/plugins/dora/e2e/snapshot_tables/lake_cicd_tasks.csv
@@ -1,20 +1,20 @@
id,name,pipeline_id,result,status,type,environment,duration_sec,started_date,finished_date
-github:GithubJob:1:8269045794,lint,github:GithubRun:1:3022052551,FAILURE,DONE,,PRODUCTION,72,2022-09-09T11:27:13.000+00:00,2022-09-09T11:28:25.000+00:00
-github:GithubJob:1:8269045795,test
(ubuntu-latest),github:GithubRun:1:3022052557,SUCCESS,DONE,,TESTING,191,2022-09-09T11:27:42.000+00:00,2022-09-09T11:30:53.000+00:00
-github:GithubJob:1:8269045819,commit-msg,github:GithubRun:1:3022052555,SUCCESS,DONE,,PRODUCTION,8,2022-09-09T11:26:38.000+00:00,2022-09-09T11:26:46.000+00:00
-github:GithubJob:1:8269045928,e2e-mysql,github:GithubRun:1:3022052558,SUCCESS,DONE,,PRODUCTION,200,2022-09-09T11:28:00.000+00:00,2022-09-09T11:31:20.000+00:00
-github:GithubJob:1:8269046116,check Apache license
header,github:GithubRun:1:3022052589,SUCCESS,DONE,,PRODUCTION,57,2022-09-09T11:28:34.000+00:00,2022-09-09T11:29:31.000+00:00
-github:GithubJob:1:8269415129,lint,github:GithubRun:1:3022190519,FAILURE,DONE,,PRODUCTION,84,2022-09-09T11:51:21.000+00:00,2022-09-09T11:52:45.000+00:00
-github:GithubJob:1:8269415130,test
(ubuntu-latest),github:GithubRun:1:3022190524,SUCCESS,DONE,,TESTING,182,2022-09-09T11:50:31.000+00:00,2022-09-09T11:53:33.000+00:00
-github:GithubJob:1:8269415142,check Apache license
header,github:GithubRun:1:3022190525,SUCCESS,DONE,,PRODUCTION,63,2022-09-09T11:52:06.000+00:00,2022-09-09T11:53:09.000+00:00
-github:GithubJob:1:8269415165,commit-msg,github:GithubRun:1:3022190521,SUCCESS,DONE,,PRODUCTION,10,2022-09-09T11:52:46.000+00:00,2022-09-09T11:52:56.000+00:00
-github:GithubJob:1:8269415315,e2e-mysql,github:GithubRun:1:3022190520,SUCCESS,DONE,,PRODUCTION,242,2022-09-09T11:53:45.000+00:00,2022-09-09T11:57:47.000+00:00
-github:GithubJob:1:8269598312,e2e-mysql,github:GithubRun:1:3022255519,SUCCESS,DONE,,PRODUCTION,828,2022-09-09T12:05:04.000+00:00,2022-09-09T12:18:52.000+00:00
-github:GithubJob:1:8269598316,test
(ubuntu-latest),github:GithubRun:1:3022255511,SUCCESS,DONE,,TESTING,1016,2022-09-09T12:05:49.000+00:00,2022-09-09T12:22:45.000+00:00
-github:GithubJob:1:8269598318,lint,github:GithubRun:1:3022255516,FAILURE,DONE,,PRODUCTION,62,2022-09-09T12:02:28.000+00:00,2022-09-09T12:03:30.000+00:00
-github:GithubJob:1:8269598325,check Apache license
header,github:GithubRun:1:3022255517,SUCCESS,DONE,,PRODUCTION,52,2022-09-09T12:03:51.000+00:00,2022-09-09T12:04:43.000+00:00
-github:GithubJob:1:8269598469,commit-msg,github:GithubRun:1:3022255524,FAILURE,DONE,,PRODUCTION,41,2022-09-09T12:06:55.000+00:00,2022-09-09T12:07:36.000+00:00
-github:GithubJob:1:8269729324,e2e-mysql,github:GithubRun:1:3022300995,SUCCESS,DONE,,PRODUCTION,1007,2022-09-09T12:10:08.000+00:00,2022-09-09T12:26:55.000+00:00
+github:GithubJob:1:8269045794,deploy,github:GithubRun:1:3022052551,FAILURE,DONE,,PRODUCTION,72,2022-09-09T11:27:13.000+00:00,2022-09-09T11:28:25.000+00:00
+github:GithubJob:1:8269045795,test
(ubuntu-latest),github:GithubRun:1:3022052557,SUCCESS,DONE,,,191,2022-09-09T11:27:42.000+00:00,2022-09-09T11:30:53.000+00:00
+github:GithubJob:1:8269045819,commit-msg,github:GithubRun:1:3022052555,SUCCESS,DONE,,,8,2022-09-09T11:26:38.000+00:00,2022-09-09T11:26:46.000+00:00
+github:GithubJob:1:8269045928,e2e-mysql,github:GithubRun:1:3022052558,SUCCESS,DONE,,,200,2022-09-09T11:28:00.000+00:00,2022-09-09T11:31:20.000+00:00
+github:GithubJob:1:8269046116,check Apache license
header,github:GithubRun:1:3022052589,SUCCESS,DONE,,,57,2022-09-09T11:28:34.000+00:00,2022-09-09T11:29:31.000+00:00
+github:GithubJob:1:8269415129,deploy,github:GithubRun:1:3022190519,FAILURE,DONE,,PRODUCTION,84,2022-09-09T11:51:21.000+00:00,2022-09-09T11:52:45.000+00:00
+github:GithubJob:1:8269415130,test
(ubuntu-latest),github:GithubRun:1:3022190524,SUCCESS,DONE,,,182,2022-09-09T11:50:31.000+00:00,2022-09-09T11:53:33.000+00:00
+github:GithubJob:1:8269415142,check Apache license
header,github:GithubRun:1:3022190525,SUCCESS,DONE,,,63,2022-09-09T11:52:06.000+00:00,2022-09-09T11:53:09.000+00:00
+github:GithubJob:1:8269415165,commit-msg,github:GithubRun:1:3022190521,SUCCESS,DONE,,,10,2022-09-09T11:52:46.000+00:00,2022-09-09T11:52:56.000+00:00
+github:GithubJob:1:8269415315,deployment,github:GithubRun:1:3022190520,SUCCESS,DONE,,PRODUCTION,242,2022-09-09T11:53:45.000+00:00,2022-09-09T11:57:47.000+00:00
+github:GithubJob:1:8269598312,e2e-mysql,github:GithubRun:1:3022255519,SUCCESS,DONE,,,828,2022-09-09T12:05:04.000+00:00,2022-09-09T12:18:52.000+00:00
+github:GithubJob:1:8269598316,test
(ubuntu-latest),github:GithubRun:1:3022255511,SUCCESS,DONE,,,1016,2022-09-09T12:05:49.000+00:00,2022-09-09T12:22:45.000+00:00
+github:GithubJob:1:8269598318,lint,github:GithubRun:1:3022255516,FAILURE,DONE,,,62,2022-09-09T12:02:28.000+00:00,2022-09-09T12:03:30.000+00:00
+github:GithubJob:1:8269598325,check Apache license
header,github:GithubRun:1:3022255517,SUCCESS,DONE,,,52,2022-09-09T12:03:51.000+00:00,2022-09-09T12:04:43.000+00:00
+github:GithubJob:1:8269598469,commit-msg,github:GithubRun:1:3022255524,FAILURE,DONE,,,41,2022-09-09T12:06:55.000+00:00,2022-09-09T12:07:36.000+00:00
+github:GithubJob:1:8269729324,e2e-mysql,github:GithubRun:1:3022300995,SUCCESS,DONE,,,1007,2022-09-09T12:10:08.000+00:00,2022-09-09T12:26:55.000+00:00
github:GithubJob:1:8269729327,xx_deploy_xx,github:GithubRun:1:3022301001,FAILURE,DONE,,PRODUCTION,82,2022-09-09T12:11:22.000+00:00,2022-09-09T12:12:44.000+00:00
github:GithubJob:1:8269729550,build_deployment,github:GithubRun:1:3022301007,SUCCESS,DONE,,PRODUCTION,6,2022-09-09T12:12:02.000+00:00,2022-09-09T12:12:08.000+00:00
github:GithubJob:1:8269729553,build_deploy,github:GithubRun:1:3022300997,SUCCESS,DONE,,PRODUCTION,57,2022-09-09T12:12:52.000+00:00,2022-09-09T12:13:49.000+00:00
diff --git a/plugins/dora/tasks/cicd_task_env_enricher.go
b/plugins/dora/tasks/cicd_task_env_enricher.go
index d04d0bc7..6c812866 100644
--- a/plugins/dora/tasks/cicd_task_env_enricher.go
+++ b/plugins/dora/tasks/cicd_task_env_enricher.go
@@ -43,22 +43,24 @@ func EnrichTasksEnv(taskCtx core.SubTaskContext) (err
errors.Error) {
repoId := data.Options.RepoId
productionNamePattern := data.Options.ProductionPattern
- stagingNamePattern := data.Options.StagingPattern
- testingNamePattern := data.Options.TestingPattern
+ // TODO: STAGE 2
+ // stagingNamePattern := data.Options.StagingPattern
+ // testingNamePattern := data.Options.TestingPattern
dataSource := data.Options.DataSoure
productionNameRegexp, errRegexp := regexp.Compile(productionNamePattern)
if errRegexp != nil {
return errors.Default.Wrap(errRegexp, "Regexp compile
productionPattern failed")
}
- stagingNameRegexp, errRegexp := regexp.Compile(stagingNamePattern)
- if errRegexp != nil {
- return errors.Default.Wrap(errRegexp, "Regexp compile
stagingPattern failed")
- }
- testingNameRegexp, errRegexp := regexp.Compile(testingNamePattern)
- if errRegexp != nil {
- return errors.Default.Wrap(errRegexp, "Regexp compile
testingPattern failed")
- }
+ // TODO: STAGE 2
+ // stagingNameRegexp, errRegexp := regexp.Compile(stagingNamePattern)
+ // if errRegexp != nil {
+ // return errors.Default.Wrap(errRegexp, "Regexp compile
stagingPattern failed")
+ // }
+ // testingNameRegexp, errRegexp := regexp.Compile(testingNamePattern)
+ // if errRegexp != nil {
+ // return errors.Default.Wrap(errRegexp, "Regexp compile
testingPattern failed")
+ // }
var cursor *sql.Rows
if len(dataSource) == 0 {
cursor, err = db.Cursor(
@@ -90,16 +92,18 @@ func EnrichTasksEnv(taskCtx core.SubTaskContext) (err
errors.Error) {
Convert: func(inputRow interface{}) ([]interface{},
errors.Error) {
cicdTask := inputRow.(*devops.CICDTask)
results := make([]interface{}, 0, 1)
- var EnvironmentVar = devops.PRODUCTION
+ var EnvironmentVar string
+ //var EnvironmentVar = devops.PRODUCTION
if productEnv :=
productionNameRegexp.FindString(cicdTask.Name); productEnv != "" {
EnvironmentVar = devops.PRODUCTION
}
- if stagingEnv :=
stagingNameRegexp.FindString(cicdTask.Name); stagingEnv != "" {
- EnvironmentVar = devops.STAGING
- }
- if testingEnv :=
testingNameRegexp.FindString(cicdTask.Name); testingEnv != "" {
- EnvironmentVar = devops.TESTING
- }
+ // TODO: STAGE 2
+ // if stagingEnv :=
stagingNameRegexp.FindString(cicdTask.Name); stagingEnv != "" {
+ // EnvironmentVar = devops.STAGING
+ // }
+ // if testingEnv :=
testingNameRegexp.FindString(cicdTask.Name); testingEnv != "" {
+ // EnvironmentVar = devops.TESTING
+ // }
cicdPipelineFilter := &devops.CICDTask{
DomainEntity: cicdTask.DomainEntity,
