From c172e08415f7f0ff82a497494a798790e4c3af42 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 7 Mar 2023 14:21:44 -0800 Subject: [PATCH] Update release mappings for 21.4 release This mapping allows object version upgrades to be navigated and needs to be updated pre-release otherwise we break the inherent upgrade job to the latest state of the development branch. Also, had to backfill the records for the bugfix branch since, while not required for that version to run, it is required to have to upgrade from that version. Also, lists antelope and 2023.1 as "named" releases, due to the abiguity and configuration, it just seemed better to be on the safe side. Change-Id: I633275caf8c3dc750023fbb27bd8a3f4d23e9fa5 --- ironic/common/release_mappings.py | 68 ++++++++++++++++++- .../unit/common/test_release_mappings.py | 2 +- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py index 7162ca4d36..eb0eb79566 100644 --- a/ironic/common/release_mappings.py +++ b/ironic/common/release_mappings.py @@ -510,6 +510,69 @@ RELEASE_MAPPING = { 'VolumeTarget': ['1.0'], } }, + '21.2': { + 'api': '1.80', + 'rpc': '1.55', + 'objects': { + 'Allocation': ['1.1'], + 'BIOSSetting': ['1.1'], + 'Node': ['1.36'], + 'NodeHistory': ['1.0'], + 'NodeInventory': ['1.0'], + 'Conductor': ['1.3'], + 'Chassis': ['1.3'], + 'Deployment': ['1.0'], + 'DeployTemplate': ['1.1'], + 'Port': ['1.10'], + 'Portgroup': ['1.4'], + 'Trait': ['1.0'], + 'TraitList': ['1.0'], + 'VolumeConnector': ['1.0'], + 'VolumeTarget': ['1.0'], + } + }, + '21.3': { + 'api': '1.81', + 'rpc': '1.55', + 'objects': { + 'Allocation': ['1.1'], + 'BIOSSetting': ['1.1'], + 'Node': ['1.36'], + 'NodeHistory': ['1.0'], + 'NodeInventory': ['1.0'], + 'Conductor': ['1.3'], + 'Chassis': ['1.3'], + 'Deployment': ['1.0'], + 'DeployTemplate': ['1.1'], + 'Port': ['1.11'], + 'Portgroup': ['1.4'], + 'Trait': ['1.0'], + 'TraitList': ['1.0'], + 'VolumeConnector': ['1.0'], + 'VolumeTarget': ['1.0'], + } + }, + '21.4': { + 'api': '1.82', + 'rpc': '1.55', + 'objects': { + 'Allocation': ['1.1'], + 'BIOSSetting': ['1.1'], + 'Node': ['1.37'], + 'NodeHistory': ['1.0'], + 'NodeInventory': ['1.0'], + 'Conductor': ['1.3'], + 'Chassis': ['1.3'], + 'Deployment': ['1.0'], + 'DeployTemplate': ['1.1'], + 'Port': ['1.11'], + 'Portgroup': ['1.5'], + 'Trait': ['1.0'], + 'TraitList': ['1.0'], + 'VolumeConnector': ['1.0'], + 'VolumeTarget': ['1.0'], + } + }, 'master': { 'api': '1.82', 'rpc': '1.55', @@ -543,12 +606,11 @@ RELEASE_MAPPING = { # # Just after we do a new named release, delete the oldest named # release (that we are no longer supporting for a rolling upgrade). -# -# There should be at most two named mappings here. -# NOTE(mgoddard): remove yoga prior to the antelope release. RELEASE_MAPPING['yoga'] = RELEASE_MAPPING['20.1'] RELEASE_MAPPING['zed'] = RELEASE_MAPPING['21.1'] +RELEASE_MAPPING['antelope'] = RELEASE_MAPPING['21.4'] +RELEASE_MAPPING['2023.1'] = RELEASE_MAPPING['21.4'] # List of available versions with named versions first; 'master' is excluded. RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True) diff --git a/ironic/tests/unit/common/test_release_mappings.py b/ironic/tests/unit/common/test_release_mappings.py index dad536257c..e6f4479b94 100644 --- a/ironic/tests/unit/common/test_release_mappings.py +++ b/ironic/tests/unit/common/test_release_mappings.py @@ -44,7 +44,7 @@ NUMERIC_RELEASES = sorted( map(versionutils.convert_version_to_tuple, set(release_mappings.RELEASE_MAPPING) # Update the exceptions whenever needed - - {'master', 'zed', 'yoga'}), + - {'master', '2023.1', 'antelope', 'zed', 'yoga'}), reverse=True)