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 09f4e071157a4e25b3efa02414edaf9233e47322 Author: linyh <[email protected]> AuthorDate: Thu Sep 15 17:27:25 2022 +0800 fix: fix some e2e test 1 --- models/domainlayer/devops/cicd_pipeline_repo.go | 3 +++ models/migrationscripts/20220915_rename_pipeline_commits.go | 5 +++-- .../{cicd_pipeline_repos.csv => cicd_pipeline_commits.csv} | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/models/domainlayer/devops/cicd_pipeline_repo.go b/models/domainlayer/devops/cicd_pipeline_repo.go index b19cc636..4abc307a 100644 --- a/models/domainlayer/devops/cicd_pipeline_repo.go +++ b/models/domainlayer/devops/cicd_pipeline_repo.go @@ -17,7 +17,10 @@ limitations under the License. package devops +import "github.com/apache/incubator-devlake/models/common" + type CiCDPipelineCommit struct { + common.NoPKModel PipelineId string `gorm:"primaryKey;type:varchar(255)"` CommitSha string `gorm:"primaryKey;type:varchar(255)"` Branch string `gorm:"type:varchar(255)"` diff --git a/models/migrationscripts/20220915_rename_pipeline_commits.go b/models/migrationscripts/20220915_rename_pipeline_commits.go index 0ff50152..4350a7f0 100644 --- a/models/migrationscripts/20220915_rename_pipeline_commits.go +++ b/models/migrationscripts/20220915_rename_pipeline_commits.go @@ -20,14 +20,14 @@ package migrationscripts import ( "context" "github.com/apache/incubator-devlake/errors" - "github.com/apache/incubator-devlake/models/domainlayer" + "github.com/apache/incubator-devlake/models/migrationscripts/archived" "gorm.io/gorm" ) type renamePipelineCommits struct{} type CiCDPipelineRepoOld struct { - domainlayer.DomainEntity + archived.DomainEntity CommitSha string `gorm:"primaryKey;type:varchar(255)"` Branch string `gorm:"type:varchar(255)"` Repo string `gorm:"type:varchar(255)"` @@ -38,6 +38,7 @@ func (CiCDPipelineRepoOld) TableName() string { } type CiCDPipelineRepo0915 struct { + archived.NoPKModel PipelineId string `gorm:"primaryKey;type:varchar(255)"` CommitSha string `gorm:"primaryKey;type:varchar(255)"` Branch string `gorm:"type:varchar(255)"` diff --git a/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_repos.csv b/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_commits.csv similarity index 98% rename from plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_repos.csv rename to plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_commits.csv index b0130e83..5eb73e87 100644 --- a/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_repos.csv +++ b/plugins/gitlab/e2e/snapshot_tables/cicd_pipeline_commits.csv @@ -1,4 +1,4 @@ -id,commit_sha,branch,repo +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
