Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: Clarify coordination for backporting process #15989

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions Documentation/contributing/development/contributing_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,35 @@ Follow the :ref:`backport_process` guide to know how to perform this task.

.. _dev_coo:

Coordination
++++++++++++

In general, coordinating in the #launchpad Slack channel with the other hat
owner for the week is encouraged. It can reduce your workload and it will avoid
backporting conflicts such as opening a PR with the same backports. Such
discussions will typically revolve around which branches to tackle and which
day of the week.

An example interaction in #launchpad:

::

Starting backport round for v1.7 and v1.8 now
cc @other-hat-wearer

The other hat owner can then handle v1.9 and v1.10 backports the next day, for
example.

If there are many backports to be done, then splitting up the rounds can be
beneficial. Typically, backporters opt to start a round in the beginning of the
week and then another near the end of the week.

By the start / end of the week, if there are other backport PRs that haven't
been merged, then please coordinate with the previous / next backporter to
check what the status is and establish who will work on getting the backports
into the tree (for instance by investigating CI failures and addressing review
feedback). There's leeway to negotiate depending on who has time available.

Developer's Certificate of Origin
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down