Skip to content

Fixes cherry-picking failure on security service

Mayra Cabrera requested to merge fixes-cherry-pick-failure-on-security-merger into master

What does this MR do?

Previously, we used the merge requests associated to a Security issue on the CherryPicker service, but none of those had the merge_commit_sha information, generating an invalid URL:

020-04-27 14:29:40.174018 D ReleaseTools::GitlabClient -- [HTTParty] [2020-04-27 14:29:40 +0000] 308 "POST https://gitlab.com/api/v4/projects/15642544/repository/commits//cherry_pick" 0

Note the double // on the POST request (/commits//cherry_pick). Now, we're sending the merge result instead that contains a merge_commit_sha.

CherryPicker service implementation was also simplified because of it.

Related to https://gitlab.com/gitlab-org/release-tools/-/issues/431 and to https://gitlab.com/gitlab-org/release-tools/-/issues/429

Edited by Mayra Cabrera

Merge request reports