From ae213e1660b00dec9079c20df9f55dcf653e7ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= <elod.illes@est.tech>
Date: Mon, 8 Apr 2024 16:40:39 +0200
Subject: [PATCH] Handle <series>-eol tagging for unmaintained
Originally when running 'new-release' command with 'eol', it checks for
stable/<series> branch only and sets HEAD of master if that does not
exist. But from now on, we have to be able to tag <series>-eol on HEAD
of unmaintained/<series> branch as well.
This patch:
- extends the check for unmaintained/<series> branch, so that its HEAD
will be used at <series>-eol tagging
- adds a check for <series>-eom tag so that the command will refuse to
create a release (with version numbers) after an EOM tag
- adds a fix to match complete <series>-eol tag when comparing with
latest version (this eliminates a bug, when the latest version is
a previous series' EOL tag, e.g. when EO{M,L}'ing tagless repos)
- handles the new type of <branch_id>-eom and <branch_id>-eol tags
(for example 2023.1-eol)
Change-Id: Id7e003b8070796cc99516a28752f94eaca62af61
---
openstack_releases/cmds/new_release.py | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/openstack_releases/cmds/new_release.py b/openstack_releases/cmds/new_release.py
index 580c53fd87..90da305208 100644
--- a/openstack_releases/cmds/new_release.py
+++ b/openstack_releases/cmds/new_release.py
@@ -295,7 +295,13 @@ def main():
except RuntimeError as err:
error(err)
if last_release:
- last_version = last_release['version'].split('.')
+ # Split last_version e.g. 2.1.0 to ['2', '1', '0'], but
+ # do not split e.g. 2023.1-eom tag to ['2023', '1-eom']
+ if (f"{get_stable_branch_id(series)}-eol" == last_release['version'] or
+ f"{get_stable_branch_id(series)}-eom" == last_release['version']):
+ last_version = [last_release['version']]
+ else:
+ last_version = last_release['version'].split('.')
else:
last_version = None
LOG.debug('last_version %r', last_version)
@@ -306,7 +312,7 @@ def main():
add_intermediate_branch = args.intermediate_branch
# Validate new tag can be applied
- if last_version and 'eol' in last_version[0]:
+ if last_version and f'{get_stable_branch_id(series)}-eol' in last_version[0]:
raise ValueError('Cannot create new release after EOL tagging.')
if last_version is None:
@@ -408,9 +414,11 @@ def main():
}
increment = None
new_version_parts = None
- new_version = '{}-{}'.format(args.series, args.release_type)
+ new_version = '{}-{}'.format(get_stable_branch_id(args.series), args.release_type)
else:
+ if last_version and f'{get_stable_branch_id(series)}-eom' in last_version[0]:
+ raise ValueError('Cannot create new release after EOM tagging.')
increment = {
'bugfix': (0, 0, 1),
'feature': (0, feature_increment(last_release), 0),
@@ -464,10 +472,13 @@ def main():
branches = gitutils.get_branches(workdir, repo)
version = 'master'
if series != '_independent':
- version = 'origin/stable/%s' % get_stable_branch_id(series)
+ version = 'origin/unmaintained/%s' % get_stable_branch_id(series)
if not any(branch for branch in branches
if branch.endswith(version)):
- version = 'master'
+ version = 'origin/stable/%s' % get_stable_branch_id(series)
+ if not any(branch for branch in branches
+ if branch.endswith(version)):
+ version = 'master'
sha = gitutils.sha_for_tag(workdir, repo, version)