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 b5467eefd8b84800ad3c8e2958cf6d1b29c3f96b Author: Yingchu Chen <[email protected]> AuthorDate: Fri Aug 5 02:23:18 2022 +0800 feat(jenkins): add jenkins pipeline convertor --- docker-compose.yml | 6 +-- .../migrationscripts/20220714_add_init_tables.go | 53 ++++++++++------------ 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index aee2117d..f15d5f67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,7 @@ services: # POSTGRES_PASSWORD: merico grafana: - image: mericodev/devlake-dashboard:latest + image: mericodev/devlake-dashboard:v0.12.1-beta build: context: grafana/ ports: @@ -60,7 +60,7 @@ services: - mysql devlake: - image: mericodev/devlake:latest + image: mericodev/devlake:v0.12.1-beta build: context: "." args: @@ -75,7 +75,7 @@ services: - mysql config-ui: - image: mericodev/devlake-config-ui:latest + image: mericodev/devlake-config-ui:v0.12.1-beta build: context: "config-ui" ports: diff --git a/plugins/jenkins/models/migrationscripts/20220714_add_init_tables.go b/plugins/jenkins/models/migrationscripts/20220714_add_init_tables.go index 7adbf7e7..79055179 100644 --- a/plugins/jenkins/models/migrationscripts/20220714_add_init_tables.go +++ b/plugins/jenkins/models/migrationscripts/20220714_add_init_tables.go @@ -20,11 +20,8 @@ package migrationscripts import ( "context" - "github.com/apache/incubator-devlake/config" - "github.com/apache/incubator-devlake/plugins/core" "github.com/apache/incubator-devlake/plugins/jenkins/models/migrationscripts/archived" "gorm.io/gorm" - "gorm.io/gorm/clause" ) type addInitTables struct{} @@ -43,37 +40,37 @@ func (*addInitTables) Up(ctx context.Context, db *gorm.DB) error { err = db.Migrator().AutoMigrate( &archived.JenkinsJob{}, &archived.JenkinsBuild{}, - &archived.JenkinsConnection{}, + //&archived.JenkinsConnection{}, ) if err != nil { return err } - v := config.GetConfig() + //v := config.GetConfig() - encKey := v.GetString("ENCODE_KEY") - endPoint := v.GetString("JENKINS_ENDPOINT") - useName := v.GetString("JENKINS_USERNAME") - passWord := v.GetString("JENKINS_PASSWORD") - if encKey == "" || endPoint == "" || useName == "" || passWord == "" { - return nil - } - conn := &archived.JenkinsConnection{} - conn.Name = "init jenkins connection" - conn.ID = 1 - conn.Endpoint = endPoint - conn.Proxy = v.GetString("JENKINS_PROXY") - conn.RateLimitPerHour = v.GetInt("JENKINS_API_REQUESTS_PER_HOUR") - conn.Username = useName - conn.Password, err = core.Encrypt(encKey, passWord) - if err != nil { - return err - } - err = db.Clauses(clause.OnConflict{DoNothing: true}).Create(conn).Error - - if err != nil { - return err - } + //encKey := v.GetString("ENCODE_KEY") + //endPoint := v.GetString("JENKINS_ENDPOINT") + //useName := v.GetString("JENKINS_USERNAME") + //passWord := v.GetString("JENKINS_PASSWORD") + //if encKey == "" || endPoint == "" || useName == "" || passWord == "" { + // return nil + //} + //conn := &archived.JenkinsConnection{} + //conn.Name = "init jenkins connection" + //conn.ID = 1 + //conn.Endpoint = endPoint + //conn.Proxy = v.GetString("JENKINS_PROXY") + //conn.RateLimitPerHour = v.GetInt("JENKINS_API_REQUESTS_PER_HOUR") + //conn.Username = useName + //conn.Password, err = core.Encrypt(encKey, passWord) + //if err != nil { + // return err + //} + //err = db.Clauses(clause.OnConflict{DoNothing: true}).Create(conn).Error + // + //if err != nil { + // return err + //} return nil }
