Improve branch deletion checks for custom/non-standard branches by better attributing Koji builds.
Fesco approved these changes before, so I made changes for an edge case where the branch is branched from a canonical stable branch, and it has a build from an older branch, and it still reported it was not safe to delete, but the build was from a canonical branch.
Here's the script: https://forge.fedoraproject.org/releng/tooling/pulls/13027.
I guess the approval you're talking about is https://pagure.io/fesco/issue/2340?
Let me rephrase the request: It is OK to delete a branch in dist-git, even if there were builds made from commits in that branch, if those commits are shared with a different branch and we can establish that the builds were actually done from that different branch, as indicated by the dist suffix.
+1
IMHO it is OK to delete a branch in dist-git, even if there were builds made from commits in that branch, only if those commits are shared with a different branch. Regardless of dist tag.
Agreed, it doesn't matter what branch the commit was built from (and in fact, building from rawhide before it branches off into a numbered release is perfectly common). I think the restriction must be: "any commit that is associated with a non-scratch build in Koji must remain in the repository". As far as I am concerned, it's entirely fine even if it only exists in an archive ref, so long as it can never be garbage-collected.
rawhide
+1 - as sgallagh said as long as we can still find the commit for any non-scratch build, it's fine - the branch name might indeed be mismatched e.g. the rawhide example cited.
+1 - as sgallagh said...
are you +1ing the original proposal or agreeing with @sgallagh? Because the proposed change is not what @sgallagh said, as I tried to point out in my original comment.
Metadata Update from @siosm: - Issue tagged with: meeting
We discussed that in today's meeting and it was not fully clear what FESCo should vote on. Can the report clarify the changes that are needed in the policy (maybe with a PR)?
See current policy: https://docs.fedoraproject.org/en-US/infra/releng_misc_guide/sop_remote_dist_git_branches/
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/5YIFT2MGTNWXFX7V672O2EJO2HSZUMHM/
Metadata Update from @siosm: - Issue untagged with: meeting
ping @jnsamyak - can you please clarify what actual changes you are proposing (i.e. what is currently not allowed but should be / vice versa)?
It is OK to delete a branch in dist-git, even if there were builds made from commits in that branch, if those commits are shared with a different branch and we can establish that the builds were actually done from that different branch, as indicated by the dist suffix.
Exactly, but talking to @churchyard and @zbyszek on the changes PR, turns out the way we invoke the script was done in a different way, which I corrected in the documentation, it needed some correction regarding the cosmetic changes, which was done. I think we can close this now.
This was briefly discussed during today's FESCo meeting (meeting log starting at 17:55).
INFO: Ticket #3583 looks resolved, will be closed. (@decathorpe:fedora.im, 17:57:27)
Metadata Update from @decathorpe: - Issue close_status updated to: Insufficient data - Issue status updated to: Closed (was: Open)