From 71c835872ab97cab918d055a515822704ed91307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= Date: Fri, 6 Dec 2024 12:23:10 +0100 Subject: [PATCH] Fix new-release command for cycle independent projects new-release command fails for cycle 'independent' projects with: KeyError: '_independent' as there is no such 'series' key when we load series_status_data for checking release-id of the used series. Since this is needed only for -eol and -eol checking, let's skip these checks in case of independent series. Change-Id: Id12b15af4e9507307b0e562648214b46c5c53aaa --- openstack_releases/cmds/new_release.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openstack_releases/cmds/new_release.py b/openstack_releases/cmds/new_release.py index 90da305208..737ef81055 100644 --- a/openstack_releases/cmds/new_release.py +++ b/openstack_releases/cmds/new_release.py @@ -297,7 +297,8 @@ def main(): if last_release: # 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 + if series != '_independent' and ( + 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: @@ -312,7 +313,8 @@ def main(): add_intermediate_branch = args.intermediate_branch # Validate new tag can be applied - if last_version and f'{get_stable_branch_id(series)}-eol' in last_version[0]: + if (last_version and series != '_independent' 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: @@ -417,7 +419,8 @@ def main(): 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]: + if (last_version and series != '_independent' 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),