@@ -121,14 +121,11 @@ If you do not have sufficient permissions to modify any field of the tracker
121121issue, just add a comment describing what changes you would like to make.
122122Someone with permissions will make the necessary modifications on your behalf.
123123
124- For straightforward backports, that's all that you (as the developer of the fix)
125- need to do. Volunteers from the `Stable Releases and Backports team `_ will
126- proceed to create Backport issues to track the necessary backports and stage the
127- backports by opening GitHub PRs with the cherry-picks. If you don't want to
128- wait, and provided you have sufficient permissions at https://tracker.ceph.com,
129- you can `create Backport tracker issues ` and `stage backports `_ yourself. In
130- that case, read on.
131-
124+ Authors of pull requests are responsible for creating associated backport pull
125+ requests. As long as you have sufficient permissions at
126+ https://tracker.ceph.com, you can `create Backport tracker issues ` and `stage
127+ backports `_ yourself. Read these linked sections to learn how to create
128+ backport tracker issues and how to stage backports:
132129
133130.. _`create backport tracker issues` :
134131.. _`backport tracker issue` :
@@ -146,10 +143,7 @@ issues can be created in the backport tracker issue for tracking the backporting
146143
147144Under ordinary circumstances, the developer who merges the ``main `` PR will flag
148145the ``main `` branch tracker issue for backport by changing the Status to "Pending
149- Backport", and volunteers from the `Stable Releases and Backports team `_
150- periodically create backport tracker issues by running the
151- ``backport-create-issue `` script. They also do the actual backporting. But that
152- does take time and you may not want to wait.
146+ Backport".
153147
154148You might be tempted to forge ahead and create the backport issues yourself.
155149Please don't do that - it is difficult (bordering on impossible) to get all the
@@ -360,30 +354,20 @@ Once the backport PR is open, the first order of business is to set the
360354Milestone tag to the stable release the backport PR is targeting. For example,
361355if the PR is targeting "nautilus", set the Milestone tag to "nautilus".
362356
363- If you don't have sufficient GitHub permissions to set the Milestone, don't
364- worry. Members of the `Stable Releases and Backports team `_ periodically run
365- a script (``ceph-backport.sh --milestones ``) which scans all PRs targetting stable
366- branches and automatically adds the correct Milestone tag if it is missing.
367-
368357Next, check which component label was applied to the ``main `` PR corresponding to
369358this backport, and double-check that that label is applied to the backport PR as
370359well. For example, if the ``main `` PR carries the component label "core", the
371360backport PR should also get that label.
372361
373- In general, it is the responsibility of the `Stable Releases and Backports
374- team `_ to ensure that backport PRs are properly labelled. If in doubt, just
375- leave the labelling to them.
376-
377362.. _`backport PR reviewing` :
378363.. _`backport PR testing` :
379364.. _`backport PR merging` :
380365
381366Reviewing, testing, and merging of backport PRs
382367-----------------------------------------------
383368
384- Once your backport PR is open and the Milestone is set properly, the
385- `Stable Releases and Backports team ` will take care of getting the PR
386- reviewed and tested. Once the PR is reviewed and tested, it will be merged.
369+ Once your backport PR is open, it will be reviewed and tested. When the PR has
370+ been reviewed and tested, it will be merged.
387371
388372If you would like to facilitate this process, you can solicit reviews and run
389373integration tests on the PR. In this case, add comments to the PR describing the
@@ -394,22 +378,3 @@ it will be merged. Even if you have sufficient GitHub permissions to merge the
394378PR, please do *not * merge it yourself. (Uncontrolled merging to stable branches
395379unnecessarily complicates the release preparation process, which is done by
396380volunteers.)
397-
398-
399- Stable Releases and Backports team
400- ----------------------------------
401-
402- Ceph has a `Stable Releases and Backports `_ team, staffed by volunteers,
403- which is charged with maintaining the stable releases and backporting bugfixes
404- from the ``main `` branch to them. (That team maintains a wiki, accessible by
405- clicking the `Stable Releases and Backports `_ link, which describes various
406- workflows in the backporting lifecycle.)
407-
408- .. _`Stable Releases and Backports` : http://tracker.ceph.com/projects/ceph-releases/wiki
409-
410- Ordinarily, it is enough to fill out the "Backport" field in the bug (tracker
411- issue). The volunteers from the Stable Releases and Backports team will
412- backport the fix, run regression tests on it, and include it in one or more
413- future point releases.
414-
415-
0 commit comments