Skip to content

Conversation

NotMyFault
Copy link
Member

Prep for 2.361.1

slide and others added 5 commits August 10, 2022 12:21
@NotMyFault NotMyFault requested a review from a team as a code owner September 6, 2022 11:59
@NotMyFault NotMyFault mentioned this pull request Sep 6, 2022
37 tasks
@krisstern
Copy link
Member

Thanks @NotMyFault

@NotMyFault NotMyFault merged commit 90ad632 into stable-2.361 Sep 6, 2022
@basil
Copy link
Member

basil commented Sep 6, 2022

Why was this PR needed? As far as I can tell, it contained no justification and everything that we cared about from an end-user perspective had been backported already (without the nuget.exe bug). As far as I can tell this PR only had the effect of introducing the nuget.exe bug.

@NotMyFault
Copy link
Member Author

Why was this PR needed?

It's part of the LTS release checklist. The LTS part expects that the stable branch is up-to-date with changes from the master branch.

@basil
Copy link
Member

basil commented Sep 6, 2022

Well sure but this kind of blind merging is precisely the type of thing that Wadeck was objecting to in another thread. There needs to be a justification for each backport.

@timja
Copy link
Member

timja commented Sep 6, 2022

Well sure but this kind of blind merging is precisely the type of thing that Wadeck was objecting to in another thread. There needs to be a justification for each backport.

this is not a backport as such, we freeze the branch at the start of each new LTS line (can be frozen earlier if say weekly has moved on with a breaking change we don't want to pull).
After the .1 release then yes changes should be backported on an as needed basis.

@basil
Copy link
Member

basil commented Sep 6, 2022

we freeze the branch at the start of each new LTS line

Then why even create the branch earlier? Just create it at the time that you are freezing it. But this doesn't make sense to me, since the entire point of a stable branch is to freeze it before the release to create a window of time during which stabilization can occur.

@NotMyFault
Copy link
Member Author

Then why even create the branch earlier?

A legitimate question. The packaging branch isn't needed until you plan to trigger the LTS job, is it?
The branch is created if you initiate a new LTS line and use the init-lts-line script.
If this happens 3 or 4 weeks before the LTS release takes place, master and stable branches easily diverge.

@daniel-beck
Copy link
Member

daniel-beck commented Sep 6, 2022

Then why even create the branch earlier?

Might be a side effect from making the LTS decision earlier before the previous LTS line is even finished. Previously, the baseline decision (and start of backporting) was the same week as .3 release, which would be a natural time to start creating branches.

If this happens 3 or 4 weeks before the LTS release takes place, master and stable branches easily diverge.

Why do we need to pick up packaging changes in weeklies after the baseline? Selectively for infra reasons makes sense, as well as regular bugfix backports like we do in core, but wholesale everything?

@basil
Copy link
Member

basil commented Sep 6, 2022

Why do we need to pick up packaging changes in weeklies after the baseline? Selectively for infra reasons makes sense, as well as regular bugfix backports like we do in core, but wholesale everything?

Exactly, that is my point as well regarding stabilization. The primary purpose of branching x number of days/weeks prior to a release is to avoid picking up potentially buggy commits on the stable branch, i.e. to create a stabilization period. Syncing indiscriminately during that time exposes the stable branch to new bugs/regressions, which defeats the point.

MarkEWaite added a commit to MarkEWaite/release that referenced this pull request Sep 8, 2022
Correct the checklist phrasing to note that we need to review changes
from the master branch but we don't want to merge them without discussion
and consideration of the impact of each of the differences.

jenkinsci/packaging#332 (comment)
is the inspiration for this pull request.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants