Fix

Author: ktsamis

jenkins_pipelines/scripts/json_generator/repository_versions/v51_nodes.py

@@ -158,4 +158,7 @@ def get_v51_static_and_client_tools(variant: str = "micro") -> (Dict[str, Dict[s
     else:
         raise ValueError(f"Invalid variant '{variant}'. Choose from: 'micro', 'sles'")
 
-    return static_repos, dynamic_maintenance_repos
+    dynamic_repos_sorted: Dict[str, List[str]] = {
+        key: sorted(paths) for key, paths in dynamic_maintenance_repos.items()
+    }
+    return static_repos, dynamic_repos_sorted

jenkins_pipelines/scripts/json_generator/repository_versions/v52_nodes.py

@@ -143,4 +143,7 @@ def get_v52_static_and_client_tools(variant: str = "micro", beta: bool = False)
     else:
         raise ValueError(f"Invalid variant '{variant}'. Choose from: 'micro', 'sles'")
 
-    return static_repos, dynamic_maintenance_repos
+    dynamic_repos_sorted: Dict[str, List[str]] = {
+        key: sorted(paths) for key, paths in dynamic_maintenance_repos.items()
+    }
+    return static_repos, dynamic_repos_sorted

jenkins_pipelines/scripts/tests/test_maintenance_json_generator.py

@@ -10,6 +10,8 @@
 
 from json_generator.maintenance_json_generator import *
 from json_generator.repository_versions.v43_nodes import v43_static_slmicro_salt_repositories
+from json_generator.repository_versions.v51_nodes import get_v51_static_and_client_tools
+from json_generator.repository_versions.v52_nodes import get_v52_static_and_client_tools
 from tests.mock_response import mock_requests_get_success
 
 TESTDATA_DIR = Path(__file__).resolve().parent / 'testdata'
@@ -36,7 +38,7 @@ def test_parse_cli_args_success(self):
         args: Namespace = parse_cli_args()
         self.assertEqual(args.version, "50-micro")
         self.assertListEqual(args.mi_ids, ['1234,5678'])
-        self.assertTrue(args.file, 'some_file')
+        self.assertEqual(args.file, 'some_file')
         self.assertTrue(args.embargo_check)
         # shorthand flags - mi_ids variant 2
         sys.argv = ['maintenance_json_generator.py', '-v', '50-micro', '-i', '1234,', '5678', '-f', 'some_file', '-e']
@@ -239,6 +241,19 @@ def test_apply_slfo_pullrequest_client_tools_beta(self):
             custom_repos,
         )
 
+    def test_v51_v52_dynamic_repos_are_sorted_lists(self):
+        test_cases = [
+            get_v51_static_and_client_tools('sles')[1],
+            get_v52_static_and_client_tools('sles', beta=False)[1],
+            get_v52_static_and_client_tools('sles', beta=True)[1],
+        ]
+
+        for dynamic_repos in test_cases:
+            self.assertIsInstance(dynamic_repos['server'], list)
+            self.assertIsInstance(dynamic_repos['proxy'], list)
+            self.assertEqual(dynamic_repos['server'], sorted(dynamic_repos['server']))
+            self.assertEqual(dynamic_repos['proxy'], sorted(dynamic_repos['proxy']))
+
     def test_update_custom_repositories(self):
         custom_repos: dict[str, dict[str, str]] = {}
         # node not present