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 8a0560dec fix: jenkin delete scope fail (#5530)
8a0560dec is described below
commit 8a0560decd1428bbcb30d117eed582e4745257f6
Author: abeizn <[email protected]>
AuthorDate: Wed Jun 21 09:51:03 2023 +0800
fix: jenkin delete scope fail (#5530)
---
backend/plugins/jenkins/impl/impl.go | 2 --
backend/plugins/jenkins/models/pipeline.go | 44 ------------------------------
backend/plugins/jenkins/models/task.go | 39 --------------------------
3 files changed, 85 deletions(-)
diff --git a/backend/plugins/jenkins/impl/impl.go
b/backend/plugins/jenkins/impl/impl.go
index f2ead7114..d43ad99bd 100644
--- a/backend/plugins/jenkins/impl/impl.go
+++ b/backend/plugins/jenkins/impl/impl.go
@@ -74,9 +74,7 @@ func (p Jenkins) GetTablesInfo() []dal.Tabler {
&models.JenkinsConnection{},
&models.JenkinsJob{},
&models.JenkinsJobDag{},
- &models.JenkinsPipeline{},
&models.JenkinsStage{},
- &models.JenkinsTask{},
}
}
diff --git a/backend/plugins/jenkins/models/pipeline.go
b/backend/plugins/jenkins/models/pipeline.go
deleted file mode 100644
index d018e9422..000000000
--- a/backend/plugins/jenkins/models/pipeline.go
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package models
-
-import (
- "github.com/apache/incubator-devlake/core/models/common"
- "time"
-)
-
-type JenkinsPipeline struct {
- common.NoPKModel
- // collected fields
- ConnectionId uint64 `gorm:"primaryKey"`
- DurationSec uint64
- Name string `gorm:"type:varchar(255);primaryKey"`
- Result string // Result
- Status string // Result
- Timestamp int64 // start time
- CreatedDate time.Time // convered by timestamp
- CommitSha string `gorm:"primaryKey;type:varchar(255)"`
- Type string `gorm:"index;type:varchar(255)"`
- Building bool
- Repo string `gorm:"type:varchar(255);index"`
- FinishedDate *time.Time
-}
-
-func (JenkinsPipeline) TableName() string {
- return "_tool_jenkins_pipelines"
-}
diff --git a/backend/plugins/jenkins/models/task.go
b/backend/plugins/jenkins/models/task.go
deleted file mode 100644
index ef3fd20ad..000000000
--- a/backend/plugins/jenkins/models/task.go
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package models
-
-import (
- "github.com/apache/incubator-devlake/core/models/domainlayer"
- "time"
-)
-
-type JenkinsTask struct {
- domainlayer.DomainEntity
- Name string `gorm:"type:varchar(255)"`
- PipelineId string `gorm:"index;type:varchar(255)"`
- Result string `gorm:"type:varchar(100)"`
- Status string `gorm:"type:varchar(100)"`
- Type string `gorm:"type:varchar(100);comment: to indicate this
is CI or CD"`
- DurationSec uint64
- StatedDate time.Time
- FinishedDate time.Time
-}
-
-func (JenkinsTask) TableName() string {
- return "_tool_jenkins_tasks"
-}
