admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source 
Signed-off-by: runzexia <runzexia@yunify.com>
This commit is contained in:
runzexia
2019-04-24 16:40:28 +08:00
committed by zryfish
parent 68809bcc38
commit 955d20fec0
8 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/tenant/tenant.go
View File

@@ -262,6 +262,7 @@ func CreateDevopsProject(req *restful.Request, resp *restful.Response) {
err := req.ReadEntity(&devops) err := req.ReadEntity(&devops)
if err != nil { if err != nil {
glog.Infof("%+v", err)
resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err)) resp.WriteHeaderAndEntity(http.StatusBadRequest, errors.Wrap(err))
return return
} }
@@ -270,6 +271,7 @@ func CreateDevopsProject(req *restful.Request, resp *restful.Response) {
project, err, code := tenant.CreateDevopsProject(username, workspaceName, &devops) project, err, code := tenant.CreateDevopsProject(username, workspaceName, &devops)
if err != nil { if err != nil {
glog.Errorf("%+v", err)
resp.WriteHeaderAndEntity(code, errors.Wrap(err)) resp.WriteHeaderAndEntity(code, errors.Wrap(err))
return return
} }

12
pkg/gojenkins/build.go
View File

@@ -24,6 +24,12 @@ import (
"time" "time"
) )
const (
Git = "git"
Hg = "hg"
Svn = "svc"
)
type Build struct { type Build struct {
Raw *BuildResponse Raw *BuildResponse
Job *Job Job *Job
@@ -392,7 +398,7 @@ func (b *Build) GetDuration() int64 {
func (b *Build) GetRevision() string { func (b *Build) GetRevision() string {
vcs := b.Raw.ChangeSet.Kind vcs := b.Raw.ChangeSet.Kind
if vcs == "git" || vcs == "hg" { if vcs == Git || vcs == Hg {
for _, a := range b.Raw.Actions { for _, a := range b.Raw.Actions {
if a.LastBuiltRevision.SHA1 != "" { if a.LastBuiltRevision.SHA1 != "" {
return a.LastBuiltRevision.SHA1 return a.LastBuiltRevision.SHA1
@@ -401,7 +407,7 @@ func (b *Build) GetRevision() string {
return a.MercurialRevisionNumber return a.MercurialRevisionNumber
} }
} }
} else if vcs == "svn" { } else if vcs == Svn {
return strconv.Itoa(b.Raw.ChangeSet.Revisions[0].Revision) return strconv.Itoa(b.Raw.ChangeSet.Revisions[0].Revision)
} }
return "" return ""
@@ -409,7 +415,7 @@ func (b *Build) GetRevision() string {
func (b *Build) GetRevisionBranch() string { func (b *Build) GetRevisionBranch() string {
vcs := b.Raw.ChangeSet.Kind vcs := b.Raw.ChangeSet.Kind
if vcs == "git" { if vcs == Git {
for _, a := range b.Raw.Actions { for _, a := range b.Raw.Actions {
if len(a.LastBuiltRevision.Branch) > 0 && a.LastBuiltRevision.Branch[0].SHA1 != "" { if len(a.LastBuiltRevision.Branch) > 0 && a.LastBuiltRevision.Branch[0].SHA1 != "" {
return a.LastBuiltRevision.Branch[0].SHA1 return a.LastBuiltRevision.Branch[0].SHA1