openstack/releases
Code Issues Proposed changes

Merge "Handle <series>-eol tagging for unmaintained"

Browse Source
This commit is contained in:
Zuul 2024-11-07 10:13:33 +00:00 committed by Gerrit Code Review
commit e5510db163
1 changed files with 16 additions and 5 deletions

21
openstack_releases/cmds/new_release.py

@ -295,7 +295,13 @@ def main():
except RuntimeError as err: except RuntimeError as err:
error(err) error(err)
if last_release: 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: else:
last_version = None last_version = None
LOG.debug('last_version %r', last_version) LOG.debug('last_version %r', last_version)
@ -306,7 +312,7 @@ def main():
add_intermediate_branch = args.intermediate_branch add_intermediate_branch = args.intermediate_branch
# Validate new tag can be applied # 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.') raise ValueError('Cannot create new release after EOL tagging.')
if last_version is None: if last_version is None:
@ -408,9 +414,11 @@ def main():
} }
increment = None increment = None
new_version_parts = 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: 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 = { increment = {
'bugfix': (0, 0, 1), 'bugfix': (0, 0, 1),
'feature': (0, feature_increment(last_release), 0), 'feature': (0, feature_increment(last_release), 0),
@ -464,10 +472,13 @@ def main():
branches = gitutils.get_branches(workdir, repo) branches = gitutils.get_branches(workdir, repo)
version = 'master' version = 'master'
if series != '_independent': 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 not any(branch for branch in branches
if branch.endswith(version)): 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) sha = gitutils.sha_for_tag(workdir, repo, version)