Integrated: 1850: CSR bot can pick up wrong fix version if PR branch is behind target branch

Zhao Song zsong at openjdk.org
Thu Apr 6 19:46:01 UTC 2023


On Fri, 31 Mar 2023 21:27:10 GMT, Zhao Song <zsong at openjdk.org> wrote:

> As SKARA-1851 fixed, now we could be able to search for CSR with the  fixVersion in .jcheck/conf from the "merge branch".
> 
> There are also some changes to CSR Command in this patch.
> 
> Originally, we need to search for CSR issues in CSR Command because updating CSR progress in PR body needs cooperation between CSR bot and PR bot(so we couldn’t trust the CSR progress in PR body).
> 
> But now, we could force the update of PR body before handling the CSR command.
> 
> The logic of handling CSR command is also easy now.
> 
> For `/csr unneeded`:
> 
> Case 1: There exists CSR progress in the pr body, in this case, the csr requirement cannot be removed and we prompt user that 'withdraw csr first then try again'
> Case 2: No CSR progress in the pr body, it means all the issues this pr solves don't have csr issue or the csr issue has already been withdrawn. In this case, we could remove the csr requirement safely.
> 
> For '/csr needed':
> 
> Case 1: The pr has csr label. We just tell the user csr is already require for this pr.
> 
> Case 2: The pr doesn't have csr label.
> In this case, there are only three possibilities
> (i) CSR is never requested and No CSR issues been created. In this case, we add CSR label to this pr and give user some prompts.
> (ii) ALL CSR issues are withdrawn. In this case, we do the same as case (i)
> (iii) ALL CSR issues are resolved. In this case, we won't add the csr label again and we just need to tell user there already exists resolved CSR issues.

This pull request has now been integrated.

Changeset: cda21207
Author:    Zhao Song <zsong at openjdk.org>
URL:       https://git.openjdk.org/skara/commit/cda2120762e573a2dfd2f55c523337de2a2ae05a
Stats:     323 lines in 6 files changed: 134 ins; 121 del; 68 mod

1850: CSR bot can pick up wrong fix version if PR branch is behind target branch

Reviewed-by: erikj

-------------

PR: https://git.openjdk.org/skara/pull/1496


More information about the skara-dev mailing list