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

fix sonarStatus api NEP, return [] if could not get last run

Browse Source 
Signed-off-by: runzexia <runzexia@yunify.com>
This commit is contained in:
runzexia
2019-05-14 16:29:54 +08:00
parent 86c7cf6185
commit a6f46bc84a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/models/devops/project_pipeline_handler.go
View File

@@ -273,9 +273,12 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son
return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} }
build, err := job.GetLastBuild() build, err := job.GetLastBuild()
if err != nil { if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} else if err != nil {
glog.Error("%+v", err)
return nil, nil
} }
sonarStatus, err := getBuildSonarResults(build) sonarStatus, err := getBuildSonarResults(build)
@@ -288,6 +291,9 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son
if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound { if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound {
glog.Errorf("%+v", err) glog.Errorf("%+v", err)
return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
} else if err != nil {
glog.Error("%+v", err)
return nil, nil
} }
sonarStatus, err = getBuildSonarResults(build) sonarStatus, err = getBuildSonarResults(build)
if err != nil { if err != nil {

1
pkg/models/routers/routers.go
View File

@@ -369,7 +369,6 @@ func createOrUpdateRouterWorkload(namespace string, publishService bool, service
} }
} }
if deployment.Spec.Template.Annotations == nil { if deployment.Spec.Template.Annotations == nil {
deployment.Spec.Template.Annotations = make(map[string]string, 0) deployment.Spec.Template.Annotations = make(map[string]string, 0)
} }