From 85f22cc2e199b8b60ca836d34cc7681bea9b679b Mon Sep 17 00:00:00 2001 From: shaowenchen Date: Tue, 21 Jul 2020 15:49:49 +0800 Subject: [PATCH] add total num for runs Signed-off-by: shaowenchen --- pkg/simple/client/devops/jenkins/pipeline.go | 8 +++++++- pkg/simple/client/devops/pipeline.go | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/simple/client/devops/jenkins/pipeline.go b/pkg/simple/client/devops/jenkins/pipeline.go index a98aba2f7..e803d31fa 100644 --- a/pkg/simple/client/devops/jenkins/pipeline.go +++ b/pkg/simple/client/devops/jenkins/pipeline.go @@ -150,6 +150,12 @@ func (p *Pipeline) ListPipelineRuns() (*devops.PipelineRunList, error) { klog.Error(err) return nil, err } + total, err := p.searchPipelineRunsCount() + if err != nil { + klog.Error(err) + return nil, err + } + pipelineRunList.Total = total return &pipelineRunList, err } @@ -160,7 +166,7 @@ func (p *Pipeline) searchPipelineRunsCount() (int, error) { query.Set("depth", "-1") //formatUrl := fmt.Sprintf(SearchPipelineRunUrl, projectName, pipelineName) - res, err := p.Jenkins.SendPureRequest(ListPipelineRunUrl+query.Encode(), p.HttpParameters) + res, err := p.Jenkins.SendPureRequest(p.Path, p.HttpParameters) if err != nil { klog.Error(err) return 0, err diff --git a/pkg/simple/client/devops/pipeline.go b/pkg/simple/client/devops/pipeline.go index a78ec0e7b..6fe18d993 100644 --- a/pkg/simple/client/devops/pipeline.go +++ b/pkg/simple/client/devops/pipeline.go @@ -81,6 +81,7 @@ type Pipeline struct { // GetPipeBranchRun & SearchPipelineRuns type PipelineRunList struct { Items []PipelineRun `json:"items"` + Total int `json:"totalItems"` } // GetBranchPipeRunNodes