Skip to content

Handle specific ref name during api calls for mr pipelines from project with merge results/trains enabled #679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Handle specific ref name during api calls for mr pipelines from project with merge results/trains enabled #679

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e9b679
handle both ref name syntax for pipelines api
cyril-dashlane Jun 29, 2023
0ebef57
Merge branch 'mvisonneau:main' into fix/mr-ref-is-different-when-mr-r…
tidalf Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions pkg/controller/pipelines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,23 @@ func (c *Controller) PullRefMetrics(ctx context.Context, ref schemas.Ref) error
return fmt.Errorf("error fetching project pipelines for %s: %v", ref.Project.Name, err)
}

// when "Enable merged results pipelines" is enabled (or other cases), the refName needs to end by /merge instead of /head
if len(pipelines) == 0 && ref.Kind == schemas.RefKindMergeRequest {
refName = fmt.Sprintf("refs/merge-requests/%s/merge", ref.Name)
pipelines, _, err = c.Gitlab.GetProjectPipelines(ctx, ref.Project.Name, &goGitlab.ListProjectPipelinesOptions{
// We only need the most recent pipeline
ListOptions: goGitlab.ListOptions{
PerPage: 1,
Page: 1,
},
Ref: &refName,
})

if err != nil {
return fmt.Errorf("error fetching project pipelines for %s: %v", ref.Project.Name, err)
}
}

if len(pipelines) == 0 {
log.WithFields(logFields).Debug("could not find any pipeline for the ref")

Expand Down