From 93b1e6f81cc7f155b96b26d3d15da346daa5d632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Wed, 31 Mar 2021 15:59:10 +0200 Subject: [PATCH] Improve R-3 and R-2 documentation Branching the devstack-plugin-* is missing since 2 cycles (victoria/wallaby), these changes add a related task at R-3 to ensure to not miss them anymore. Some tasks of R-2 aren't crystal clear about the expected state of the series branching. Some commands are more or less duplicated and inefficient. Indeed, the QA PTL should be "reminded" once branching is done but the checks are made after. Also we previous version of this doc was using two commands who are more or less similar, however, one of them doesn't caught the `cycle-with-intermediary` deliverables and also doesn't ignore trailing projects (branching isn't mandatory at this point for them). These changes remove the duplicated commands and prefer to use the better one. These changes reorder steps to "remind" people at the right time and when all prerequisite are there. Change-Id: I765e74b15e1f8fc6e45fb90662d04464faf17640 --- doc/source/reference/process.rst | 38 ++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/doc/source/reference/process.rst b/doc/source/reference/process.rst index 9873a3b9fe..08f40e0a57 100644 --- a/doc/source/reference/process.rst +++ b/doc/source/reference/process.rst @@ -1120,6 +1120,12 @@ R-3 week (RC1 deadline) #. On the Monday, generate release requests for all deliverables that have do not have a suitable candidate yet. That includes: + - Branch ``devstack-plugin-*`` delivrables. Usually devstack plugings are + branchless and tagless so out of our jurisdiction, however, some are just + tagless so they are deliverables that must be branched. Please use the + gerrit topic ``devstack-plugin-$series`` to help to track them. Example + https://review.opendev.org/c/openstack/releases/+/785180 + - cycle-with-intermediary deliverables that have not released yet, for which a release should be proposed from HEAD. Stable branch creation should be included, unless the deliverable has specified the @@ -1251,8 +1257,24 @@ R-2 week or from the `release project `__. - - Remind the QA PTL to manage their release duties - (c.f https://wiki.openstack.org/wiki/QA/releases). + - At this point all projects should have their branches created, + as doing the branching first is a prerequisite to allow us to branch + requirements. You can ensure that all projects are branched by using + ``tox -e venv -- list-deliverables --no-stable-branch + --cycle-based-no-trailing`` where a non empty list mean that some + projects are missing a stable branch and a patch should be proposed to + create it. The requirements team expect an empty output of this + command, so you should not continue to the next point until its output + is empty. + + .. note:: + + The previous command will return the `requirements` deliverable + however in this case this one can be ignored, because our goal is to + branch it. + + - If the previous list is empty then remind the QA PTL to manage their + release duties (cf. https://wiki.openstack.org/wiki/QA/releases). .. note:: @@ -1271,24 +1293,12 @@ R-2 week - Remind the I18n PTL to update the translation tools for the new stable series. - - Ensure that all cycle-with-rc projects have their branches created. - This could be done by using ``tox -e venv -- list-deliverables - --model cycle-with-rc --no-stable-branch`` where a non empty list mean - that some projects are missing a stable branch and a patch proposed - to create it. - - If the previous list is empty then we can remind the requirements PTL to propose an update to the deliverable file to create the ``stable/$series`` branch for ``openstack/requirements`` and then remind to him to announce that the requirements freeze is lifted from master. - .. note:: - - The requirements team expect for an empty output of:: - - tox -e venv -- list-deliverables --no-stable-branch --cycle-based-no-trailing - .. note:: We wait until after the other projects have branched to