marge-bot
marge-bot copied to clipboard
Marge-bot rebase error when CI is in progress
- Have MR which is approved but with CI running
- Assign it to marge-bot
- Make sure marge-bot refuses to wait and tries to rebase instead (why???)
INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp fetch --prune origin
2019-07-29 08:44:39,990 INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp checkout -B mybranch --
2019-07-29 08:44:40,026 INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp rebase origin/master
2019-07-29 08:44:40,172 INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp rev-parse HEAD
2019-07-29 08:44:40,177 INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp rev-parse origin/master
2019-07-29 08:44:40,182 INFO Adding trailers for MR !76
2019-07-29 08:44:40,182 INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp rev-parse HEAD
2019-07-29 08:44:43,043 INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp checkout -B master --
2019-07-29 08:44:43,075 INFO Running git -C /tmp_d901f7r/tmp6_1uwlgp branch -D mybranch
2019-07-29 08:44:43,081 WARNING I couldn't merge this branch: GitLab failed to rebase the branch saying: Rebase failed. Please rebase locally
2019-07-29 08:44:43,081 INFO Unassigning from MR !76
Please detect when CI in progress and just skip this MR from current processing round.
I'm not sure what the relationship between CI running and rebase problems would be, can you please elaborate? Are you sure there wasn't just a rebase conflict?
I expect that bot should do nothing if pipeline fails. So if you see pipeline running, probably you should skip it at the moment.
I am sure it was not a rebase conflict. It didn't even called "rebase" - it was still available in the UI and worked perfectly when clicked manually.