From a6f46bc84ac57a12ca2c651f47c60371238e3a44 Mon Sep 17 00:00:00 2001 From: runzexia Date: Tue, 14 May 2019 16:29:54 +0800 Subject: [PATCH 1/3] fix sonarStatus api NEP, return `[]` if could not get last run Signed-off-by: runzexia --- pkg/models/devops/project_pipeline_handler.go | 8 +++++++- pkg/models/routers/routers.go | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/models/devops/project_pipeline_handler.go b/pkg/models/devops/project_pipeline_handler.go index 9bfa3db13..bcdda2a85 100644 --- a/pkg/models/devops/project_pipeline_handler.go +++ b/pkg/models/devops/project_pipeline_handler.go @@ -273,9 +273,12 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) } build, err := job.GetLastBuild() - if err != nil { + if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound { glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) + } else if err != nil { + glog.Error("%+v", err) + return nil, nil } sonarStatus, err := getBuildSonarResults(build) @@ -288,6 +291,9 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound { glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) + } else if err != nil { + glog.Error("%+v", err) + return nil, nil } sonarStatus, err = getBuildSonarResults(build) if err != nil { diff --git a/pkg/models/routers/routers.go b/pkg/models/routers/routers.go index ee0ab7b39..2c93ef139 100644 --- a/pkg/models/routers/routers.go +++ b/pkg/models/routers/routers.go @@ -369,7 +369,6 @@ func createOrUpdateRouterWorkload(namespace string, publishService bool, service } } - if deployment.Spec.Template.Annotations == nil { deployment.Spec.Template.Annotations = make(map[string]string, 0) } From 11a9d166ee657add752ceb70a26aaab1b9cd31cf Mon Sep 17 00:00:00 2001 From: runzexia Date: Tue, 14 May 2019 16:31:42 +0800 Subject: [PATCH 2/3] fix Signed-off-by: runzexia --- pkg/models/devops/project_pipeline_handler.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/models/devops/project_pipeline_handler.go b/pkg/models/devops/project_pipeline_handler.go index bcdda2a85..7b6971e47 100644 --- a/pkg/models/devops/project_pipeline_handler.go +++ b/pkg/models/devops/project_pipeline_handler.go @@ -235,9 +235,12 @@ func GetPipelineSonar(projectId, pipelineId string) ([]*SonarStatus, error) { return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) } build, err := job.GetLastBuild() - if err != nil { + if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound { glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) + } else if err != nil { + glog.Error("%+v", err) + return nil, nil } sonarStatus, err := getBuildSonarResults(build) @@ -250,6 +253,9 @@ func GetPipelineSonar(projectId, pipelineId string) ([]*SonarStatus, error) { if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound { glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) + } else if err != nil { + glog.Error("%+v", err) + return nil, nil } sonarStatus, err = getBuildSonarResults(build) if err != nil { From 5e4b50061c4bf4a9e62349ec49e10a8b00064ae8 Mon Sep 17 00:00:00 2001 From: runzexia Date: Tue, 14 May 2019 17:15:46 +0800 Subject: [PATCH 3/3] fix ci --- pkg/models/devops/project_pipeline_handler.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/models/devops/project_pipeline_handler.go b/pkg/models/devops/project_pipeline_handler.go index 7b6971e47..1bbc2eee2 100644 --- a/pkg/models/devops/project_pipeline_handler.go +++ b/pkg/models/devops/project_pipeline_handler.go @@ -239,7 +239,7 @@ func GetPipelineSonar(projectId, pipelineId string) ([]*SonarStatus, error) { glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) } else if err != nil { - glog.Error("%+v", err) + glog.Errorf("%+v", err) return nil, nil } @@ -254,7 +254,7 @@ func GetPipelineSonar(projectId, pipelineId string) ([]*SonarStatus, error) { glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) } else if err != nil { - glog.Error("%+v", err) + glog.Errorf("%+v", err) return nil, nil } sonarStatus, err = getBuildSonarResults(build) @@ -283,7 +283,7 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) } else if err != nil { - glog.Error("%+v", err) + glog.Errorf("%+v", err) return nil, nil } @@ -298,7 +298,7 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son glog.Errorf("%+v", err) return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error()) } else if err != nil { - glog.Error("%+v", err) + glog.Errorf("%+v", err) return nil, nil } sonarStatus, err = getBuildSonarResults(build)