pw-brancher: set contest failure in case of conflicts#87
Conversation
When a pull request or a series cannot be applied for some reasons -- e.g. in case of conflicts with pending patches, or with patches applied in net, but not in net-next yet -- the errors were ignored. Because of that, it was easy to miss that a series has not been fully validated as expected, e.g. [1]. When such errors happen, a PatchWork 'contest' check is now created for each patch, with the 'fail' state and a short description. No URL is added, because such logs are currently not publicly available. Link: https://patchwork.kernel.org/project/netdevbpf/patch/20260710134242.216538-10-alice.kernel@fastmail.im/ [1] Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
It will not be nicely formatted on PW, but it should help to understand with what it was conflicting. Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
|
Looks useful but we'll be posting the check every time a branch is created? Patchwork doesn't dedup identical checks. |
Yes, that's right. Do you think that's an issue? Patchwork wool only show the last one. I think we have to retry just in case the other patch(es) causing conflicts is/are dropped. That should be rare I guess, and such patches should be dropped "quickly" I suppose. Do you think we should remember the error and stop trying? Should we mark it as changed-requested when there is a conflict? |
|
We should either query or remember. The UI only shows the last check but API endpoints will list all of them. We should try to be good citizens :S |
Indeed, you are right. Because such patch conflicting with others shouldn't be that common, I suggest querying patchwork before setting a new "check" entry. I will check that later. |
2 participants
When a pull request or a series cannot be applied for some reasons -- e.g. in case of conflicts with pending patches, or with patches applied in net, but not in net-next yet -- the errors were ignored.
Because of that, it was easy to miss that a series has not been fully validated as expected, e.g. [1].
When such errors happen, a PatchWork 'contest' check is now created for each patch, with the 'fail' state and a short description. No URL is added, because such logs are currently not publicly available.
Link: https://patchwork.kernel.org/project/netdevbpf/patch/20260710134242.216538-10-alice.kernel@fastmail.im/ [1]