From 5857ca0cd5bc4949f77b9f3b6c3e0d7ab97f6b88 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Wed, 18 Sep 2024 11:45:04 -0700
Subject: [PATCH] Update release mappings

Change-Id: I34ebd75faa4129732b5018af9801721ed992c16d
---
 ironic/common/release_mappings.py             | 70 ++++++++++++++++++-
 .../unit/common/test_release_mappings.py      |  7 --
 2 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py
index 0fcde58dea..0cfe6a6b98 100644
--- a/ironic/common/release_mappings.py
+++ b/ironic/common/release_mappings.py
@@ -704,6 +704,73 @@ RELEASE_MAPPING = {
             'FirmwareComponent': ['1.0'],
         }
     },
+    '25.0': {
+        'api': '1.91',
+        'rpc': '1.59',
+        'objects': {
+            'Allocation': ['1.1'],
+            'BIOSSetting': ['1.1'],
+            'Node': ['1.40', '1.39', '1.38', '1.37'],
+            'NodeHistory': ['1.0'],
+            'NodeInventory': ['1.0'],
+            'Conductor': ['1.4'],
+            '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'],
+            'FirmwareComponent': ['1.0'],
+        }
+    },
+    '26.0': {
+        'api': '1.91',
+        'rpc': '1.60',
+        'objects': {
+            'Allocation': ['1.1'],
+            'BIOSSetting': ['1.1'],
+            'Node': ['1.40', '1.39', '1.38', '1.37'],
+            'NodeHistory': ['1.0'],
+            'NodeInventory': ['1.0'],
+            'Conductor': ['1.4'],
+            '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'],
+            'FirmwareComponent': ['1.0'],
+        }
+    },
+    '26.1': {
+        'api': '1.93',
+        'rpc': '1.61',
+        'objects': {
+            'Allocation': ['1.1'],
+            'BIOSSetting': ['1.1'],
+            'Node': ['1.40', '1.39', '1.38', '1.37'],
+            'NodeHistory': ['1.0'],
+            'NodeInventory': ['1.0'],
+            'Conductor': ['1.4'],
+            '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'],
+            'FirmwareComponent': ['1.0'],
+            'Runbook': ['1.0'],
+        }
+    },
     # NOTE(TheJulia): Items above this line are for shipped versions
     # for the mappings. If your making a non-release related change,
     # make it below. To release, we will preserve a version matching
@@ -714,7 +781,7 @@ RELEASE_MAPPING = {
         'objects': {
             'Allocation': ['1.1'],
             'BIOSSetting': ['1.1'],
-            'Node': ['1.40', '1.39', '1.38', '1.37'],
+            'Node': ['1.40'],
             'NodeHistory': ['1.0'],
             'NodeInventory': ['1.0'],
             'Conductor': ['1.4'],
@@ -750,6 +817,7 @@ RELEASE_MAPPING['antelope'] = RELEASE_MAPPING['21.4']
 RELEASE_MAPPING['2023.1'] = RELEASE_MAPPING['21.4']
 RELEASE_MAPPING['2023.2'] = RELEASE_MAPPING['23.0']
 RELEASE_MAPPING['2024.1'] = RELEASE_MAPPING['24.1']
+RELEASE_MAPPING['2024.2'] = RELEASE_MAPPING['26.1']
 
 # 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 abb41d6567..71b8a4bfb8 100644
--- a/ironic/tests/unit/common/test_release_mappings.py
+++ b/ironic/tests/unit/common/test_release_mappings.py
@@ -121,13 +121,6 @@ class ReleaseMappingsTestCase(base.TestCase):
                     self.assertTrue(_check_versions_compatibility(
                         ver, registered_objects[obj_name][0].VERSION))
 
-    def test_no_gaps_in_release_versions(self):
-        for i, ver in enumerate(NUMERIC_RELEASES[:-1]):
-            prev = NUMERIC_RELEASES[i + 1]
-            if ver != (prev[0] + 1, 0) and ver != (prev[0], prev[1] + 1):
-                self.fail("Versions %s and %s are not sequential"
-                          % (prev, ver))
-
     def test_no_gaps_in_object_versions(self):
         oldest_release = '%d.%d' % NUMERIC_RELEASES[-1]
         oldest_versions = release_mappings.RELEASE_MAPPING[