Skip to content

sync with upstream gitlab.com/marge-org/marge-bot.git

Deborah Brouwer requested to merge dbrouwer/marge-bot:upstream-sync into main

As discussed in #2 here is an MR to sync with upstream marge-bot.

There was just one conflict, the upstream commit

  • 4cd8a1a9 Retry requesting pipeline status up to 5 times per MR when getting 5xx errors

made some minor clean-up/polishing changes to an existing commit in this repository

  • 94131e16 Retry requesting status up to 5 consecutive times when getting 5xx errors

so I kept the upstream changes in this MR.

Otherwise 123 of the patches look basically harmless:

  • 42 patches to merge branches
  • 71 housekeeping, documentation, style type commits (often but not always prefixed by chore)
  • 6 commits for the marge-bot ci testing itself
  • 4 commits to add new option flags that could be configured ('--batch-branch-name, '--exc-comment, --custom-approver, --keep-reviewers)

Some commits are functional but look helpful or at least harmless too:

  • 8a3442a0 fix: Use python-gitlab for HTTP requests
  • 04e8000b job: timeout between check and wait from @eric
  • fbad6a52 Fix getting an API error message
  • 1eb8e328 fix: Use include_rebase_in_progress in rebase API
  • 0f9f8c33 Handle newer message that may also imply "do a branch pipeline"
  • c2e65d29 Replace all WIP references with Draft and only read the draft field in the API

Finally, there are two commits for batch jobs which I don’t think are relevant to mesa.

  • 81f74630 batch_job: Cancel obsolete pipelines when closing
  • 7253157b Remove source branches in batch jobs if necessary

I also ran a test with the upstream changes using this test user @marge-bot-mesa and everything worked fine: dbrouwer/mesa!36 (merged)

@daniels @gallo

Edited by Deborah Brouwer

Merge request reports