You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2022/07/21 10:08:59 UTC
[incubator-devlake] branch main updated (7fe955ab -> ea9ef222)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
from 7fe955ab fix: fix if gitlab api response with no type or issuetype (#2556)
new b2434a07 fix: jobs miss type field
new ea9ef222 fix: jobs miss type field and update e2e test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
models/domainlayer/devops/job.go | 1 +
...step_to_stage.go => 20220721_add_type_filed.go} | 27 ++++++++++++++++------
models/migrationscripts/register.go | 1 +
plugins/jenkins/e2e/jobs_test.go | 1 +
plugins/jenkins/e2e/snapshot_tables/jobs.csv | 18 +++++++--------
plugins/jenkins/tasks/job_convertor.go | 1 +
6 files changed, 33 insertions(+), 16 deletions(-)
copy models/migrationscripts/{20220505_rename_step_to_stage.go => 20220721_add_type_filed.go} (66%)
[incubator-devlake] 02/02: fix: jobs miss type field and update e2e test
Posted by ab...@apache.org.
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 ea9ef22249baf3948cfe25675101afa1d9cd457f
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu Jul 21 16:39:16 2022 +0800
fix: jobs miss type field and update e2e test
---
plugins/jenkins/e2e/jobs_test.go | 1 +
plugins/jenkins/e2e/snapshot_tables/jobs.csv | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/plugins/jenkins/e2e/jobs_test.go b/plugins/jenkins/e2e/jobs_test.go
index da0a9b8c..576664ff 100644
--- a/plugins/jenkins/e2e/jobs_test.go
+++ b/plugins/jenkins/e2e/jobs_test.go
@@ -76,6 +76,7 @@ func TestJenkinsJobsDataFlow(t *testing.T) {
"_raw_data_table",
"_raw_data_id",
"_raw_data_remark",
+ "type",
},
)
}
diff --git a/plugins/jenkins/e2e/snapshot_tables/jobs.csv b/plugins/jenkins/e2e/snapshot_tables/jobs.csv
index 13ac2c44..2d511d14 100644
--- a/plugins/jenkins/e2e/snapshot_tables/jobs.csv
+++ b/plugins/jenkins/e2e/snapshot_tables/jobs.csv
@@ -1,9 +1,9 @@
-id,name,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-jenkins:JenkinsJob:1:devlake,devlake,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,12,
-jenkins:JenkinsJob:1:dir-test,dir-test,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,13,
-jenkins:JenkinsJob:1:dir-test-2,dir-test-2,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,16,
-jenkins:JenkinsJob:1:free,free,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,19,
-jenkins:JenkinsJob:1:pipeline-test,pipeline-test,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,17,
-jenkins:JenkinsJob:1:testfile,testfile,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,18,
-jenkins:JenkinsJob:1:测试流水线,测试流水线,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,14,
-jenkins:JenkinsJob:1:这是一个改了名字的测试任务,这是一个改了名字的测试任务,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,15,
+id,name,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,type
+jenkins:JenkinsJob:1:devlake,devlake,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,12,,hudson.model.FreeStyleProject
+jenkins:JenkinsJob:1:dir-test,dir-test,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,13,,com.cloudbees.hudson.plugins.folder.Folder
+jenkins:JenkinsJob:1:dir-test-2,dir-test-2,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,16,,com.cloudbees.hudson.plugins.folder.Folder
+jenkins:JenkinsJob:1:free,free,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,19,,hudson.model.FreeStyleProject
+jenkins:JenkinsJob:1:pipeline-test,pipeline-test,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,17,,org.jenkinsci.plugins.workflow.job.WorkflowJob
+jenkins:JenkinsJob:1:testfile,testfile,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,18,,hudson.model.FreeStyleProject
+jenkins:JenkinsJob:1:测试流水线,测试流水线,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,14,,org.jenkinsci.plugins.workflow.job.WorkflowJob
+jenkins:JenkinsJob:1:这是一个改了名字的测试任务,这是一个改了名字的测试任务,"{""ConnectionId"":1}",_raw_jenkins_api_jobs,15,,hudson.model.FreeStyleProject
[incubator-devlake] 01/02: fix: jobs miss type field
Posted by ab...@apache.org.
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 b2434a072b6f03257280a85115a9e90e2f8cee86
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu Jul 21 16:26:23 2022 +0800
fix: jobs miss type field
---
models/domainlayer/devops/job.go | 1 +
.../20220721_add_type_filed.go} | 34 ++++++++++++++++++----
models/migrationscripts/register.go | 1 +
plugins/jenkins/tasks/job_convertor.go | 1 +
4 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/models/domainlayer/devops/job.go b/models/domainlayer/devops/job.go
index 9a008c66..56594b2f 100644
--- a/models/domainlayer/devops/job.go
+++ b/models/domainlayer/devops/job.go
@@ -23,6 +23,7 @@ import (
type Job struct {
Name string `gorm:"type:varchar(255)"`
+ Type string `gorm:"type:varchar(255)"`
domainlayer.DomainEntity
}
diff --git a/models/domainlayer/devops/job.go b/models/migrationscripts/20220721_add_type_filed.go
similarity index 58%
copy from models/domainlayer/devops/job.go
copy to models/migrationscripts/20220721_add_type_filed.go
index 9a008c66..22a7fe08 100644
--- a/models/domainlayer/devops/job.go
+++ b/models/migrationscripts/20220721_add_type_filed.go
@@ -15,17 +15,41 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package devops
+package migrationscripts
import (
- "github.com/apache/incubator-devlake/models/domainlayer"
+ "context"
+
+ "github.com/apache/incubator-devlake/models/migrationscripts/archived"
+ "gorm.io/gorm"
)
-type Job struct {
+type Job20220721 struct {
Name string `gorm:"type:varchar(255)"`
- domainlayer.DomainEntity
+ Type string `gorm:"type:varchar(255)"`
+ archived.DomainEntity
}
-func (Job) TableName() string {
+func (Job20220721) TableName() string {
return "jobs"
}
+
+type addTypeField struct{}
+
+func (*addTypeField) Up(ctx context.Context, db *gorm.DB) error {
+
+ err := db.Migrator().AddColumn(Job20220721{}, "type")
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (*addTypeField) Version() uint64 {
+ return 20220721000005
+}
+
+func (*addTypeField) Name() string {
+ return "add column `type` at jobs"
+}
diff --git a/models/migrationscripts/register.go b/models/migrationscripts/register.go
index f2a7f38a..5294da8f 100644
--- a/models/migrationscripts/register.go
+++ b/models/migrationscripts/register.go
@@ -28,5 +28,6 @@ func All() []migration.Script {
new(updateBlueprintMode),
new(renameTasksToPlan),
new(addDomainTables),
+ new(addTypeField),
}
}
diff --git a/plugins/jenkins/tasks/job_convertor.go b/plugins/jenkins/tasks/job_convertor.go
index 0d73947a..96846535 100644
--- a/plugins/jenkins/tasks/job_convertor.go
+++ b/plugins/jenkins/tasks/job_convertor.go
@@ -71,6 +71,7 @@ func ConvertJobs(taskCtx core.SubTaskContext) error {
Id: jobIdGen.Generate(jenkinsJob.ConnectionId, jenkinsJob.Name),
},
Name: jenkinsJob.Name,
+ Type: jenkinsJob.Class,
}
return []interface{}{
job,