From 62285e71154e38dd161a5ba2b51acf0a731a1af7 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Thu, 9 Jan 2025 15:33:00 +0100 Subject: [PATCH] Fix bugfix branch release info Change-Id: I2ec9e092b1c4c0440f4279f8a5469fe10c8e9b3b --- doc/source/contributor/releasing.rst | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/doc/source/contributor/releasing.rst b/doc/source/contributor/releasing.rst index 66d49ac867..9cd56419e8 100644 --- a/doc/source/contributor/releasing.rst +++ b/doc/source/contributor/releasing.rst @@ -141,8 +141,8 @@ To leave some version space for releases from these branches, releases of these projects from the master branch always increase either the major or the minor version. -Currently releases and retirements from bugfix branches cannot be automated and -must be done by the release team manually. +Currently retirement of bugfix branches cannot be automated and +must be done by the ironic team manually as explained below. There are usually 3 bugfix branches present at all time, the latest 2 are actively maintained, while the third one is considered unmaintained. @@ -190,12 +190,16 @@ the creation of a new one: git push gerrit --delete bugfix/24.0 -After the creation of a bugfix branch it may be necessary to update +After the creation of a bugfix branch it is highly recommended to update the upper-constraints link for the tests in the tox.ini file, plus override the branch for the requirements project to be sure to use the correct -upper-constraints; for example see the following change: +upper-constraints from the branch creation time; for example see the +following change: -https://review.opendev.org/c/openstack/Ironic-python-agent/+/841290 +https://review.opendev.org/c/openstack/ironic/+/938660 + +It is also mandatory to comment out the metal3 integration job as it is not +supposed to run in stable or bugfix branches. Things to do before releasing =============================