Add 5.2 support on JSON Generator

Author: srbarrios

jenkins_pipelines/scripts/json_generator/README.md

@@ -6,7 +6,7 @@ README files for each script:
 ## Scripts
 
 - [maintenance_json_generator script README](./maintenance_json_generator_README.md) - Automates gathering and
-processing of open QAM SLE requests that affect SUMA 4.3 and 5.0 and generates JSON output for BV testsuite
+processing of open QAM SLE requests that affect SUMA 4.3, 5.0, 5.1, and 5.2 and generates JSON output for BV testsuite
 - [ibs_osc_client_README](./ibs_osc_client_README.md) - checks embargo status and processes repository information
 - [smash_client_README](./smash_client_README.md) - interacts with SUSE Manager's SMASH API to retrieve and manage embargoed bug IDs and CVEs.
 

jenkins_pipelines/scripts/json_generator/ibs_osc_client_README.md

@@ -30,7 +30,7 @@ performs the following tasks:
   details about MIs and their associated repositories.
 
 The output is a JSON file, which can be used for further testing in the BV
-(Business Validation) testsuite pipeline. The script supports both SUSE Manager
+(Build Validation) testsuite pipeline. The script supports both SUSE Manager
 4.3 (SUMA 4.3) and SUSE Manager 5.0 (SUMA 5.0).
 
 ## Features

jenkins_pipelines/scripts/json_generator/maintenance_json_generator.py

@@ -18,8 +18,8 @@ def parse_cli_args() -> argparse.Namespace:
         description="This script reads the open qam-manager requests and creates a json file that can be fed to the BV testsuite pipeline"
     )
     parser.add_argument("-v", "--version", dest="version",
-                        help="Version of SUMA you want to run this script for, the options are 43 for 4.3, 50 for 5.0, and 51 for 5.1",
-                        choices=["43", "50-micro", "50-sles", "51-micro","51-sles"], default="43", action='store')
+                        help="Version of SUMA you want to run this script for, the options are 43 for 4.3, 50 for 5.0, 51 for 5.1, and 52 for 5.2",
+                        choices=["43", "50-micro", "50-sles", "51-micro","51-sles", "52-micro", "52-sles"], default="43", action='store')
     parser.add_argument("-i", "--mi_ids", required=False, dest="mi_ids", help="Space separated list of MI IDs", nargs='*', action='store')
     parser.add_argument("-f", "--file", required=False, dest="file", help="Path to a file containing MI IDs separated by newline character", action='store')
     parser.add_argument("-e", "--no_embargo", dest="embargo_check", help="Reject MIs under embargo",  action='store_true')
@@ -73,7 +73,7 @@ def get_version_nodes(version: str):
 
 def init_custom_repositories(version: str, static_repos: dict[str, dict[str, str]] = None) -> dict[str, dict[str, str]]:
     custom_repositories: dict[str, dict[str, str]] = {}
-    if version.startswith("51") and static_repos:
+    if (version.startswith("51") or version.startswith("52")) and static_repos:
         for node, named_urls in static_repos.items():
             custom_repositories[node] = {
                 name: f"{IBS_MAINTENANCE_URL_PREFIX}{url}" if not url.startswith("http") else url

jenkins_pipelines/scripts/json_generator/maintenance_json_generator_README.md

@@ -19,7 +19,7 @@
 This Python script automates the process of gathering and processing open QAM
 (Quality Assurance Maintenance) requests for SUSE Linux Enterprise Server (SLES)
 that affect SUSE Manager. The output is a JSON file, which can be fed into the
-BV (Business Validation) testsuite pipeline for further testing. It supports
+BV (Build Validation) testsuite pipeline for further testing. It supports
 both SUSE Manager 4.3 (SUMA 4.3) and SUSE Manager 5.0 (SUMA 5.0).
 
 The script allows users to input Maintenance Incident (MI) IDs and generates the
@@ -51,7 +51,7 @@ python3.11 maintenance_json_generator.py [options]
 Options:
 
 `-v`, `--version`: Specifies the SUSE Manager version. Options are `43` for SUSE
-Manager 4.3 and `50` for SUSE Manager 5.0. Default is 43.
+Manager 4.3, `50-micro` / `50-sles` for 5.0, `51-micro` / `51-sles` for 5.1, and `52-micro` / `52-sles` for 5.2. Default is 43.
 `-i`, `--mi_ids`: A space-separated list of MI IDs.
 `-f`, `--file`: Path to a file containing MI IDs, each on a new line.
 `-e`, `--no_embargo`: Reject any MIs that are currently under embargo.

jenkins_pipelines/scripts/json_generator/repository_versions/__init__.py

@@ -1,14 +1,20 @@
 from .v43_nodes import get_v43_nodes_sorted
 from .v50_nodes import get_v50_nodes_sorted
 from .v51_nodes import get_v51_static_and_client_tools
+from .v52_nodes import get_v52_static_and_client_tools
 
 static_51_micro, dynamic_51_micro = get_v51_static_and_client_tools("micro")
 static_51_sles, dynamic_51_sles = get_v51_static_and_client_tools("sles")
 
+static_52_micro, dynamic_52_micro = get_v52_static_and_client_tools("micro")
+static_52_sles, dynamic_52_sles = get_v52_static_and_client_tools("sles")
+
 nodes_by_version: dict[str, dict[str, dict[str, list[str]]]] = {
     "43": {"dynamic": get_v43_nodes_sorted()},
     "50-micro": {"dynamic": get_v50_nodes_sorted(get_v43_nodes_sorted(), "micro")},
     "50-sles": {"dynamic": get_v50_nodes_sorted(get_v43_nodes_sorted(), "sles")},
     "51-sles": {"static": static_51_sles, "dynamic": dynamic_51_sles},
-    "51-micro": {"static": static_51_micro, "dynamic": dynamic_51_micro}
+    "51-micro": {"static": static_51_micro, "dynamic": dynamic_51_micro},
+    "52-sles": {"static": static_52_sles, "dynamic": dynamic_52_sles},
+    "52-micro": {"static": static_52_micro, "dynamic": dynamic_52_micro}
 }

jenkins_pipelines/scripts/json_generator/repository_versions/v52_nodes.py

@@ -0,0 +1,68 @@
+from typing import Dict, Set, List
+
+# Import the shared client tools from 5.1
+from .v51_nodes import (
+    v51_nodes_static_client_tools_repositories,
+    v51_nodes_dynamic_client_tools_repos,
+    IBS_URL_PREFIX
+)
+
+# Define 5.2 specific Server and Proxy repositories (using 15-SP7)
+v52_uyuni_tools_sles_repos: Dict[str, Set[str]] = {
+    "server" : {"/SUSE_Updates_Multi-Linux-Manager-Server-SLE_5.2_x86_64/",
+                "/SUSE_Updates_SLE-Module-Server-Applications_15-SP7_x86_64/",
+                "/SUSE_Updates_SLE-Module-Basesystem_15-SP7_x86_64/",
+                "/SUSE_Updates_SLE-Module-Containers_15-SP7_x86_64/",
+                "/SUSE_Updates_SLE-Module-Python3_15-SP7_x86_64/"},
+    "proxy" : { "/SUSE_Updates_Multi-Linux-Manager-Proxy-SLE_5.2_x86_64/",
+                "/SUSE_Updates_Multi-Linux-Manager-Retail-Branch-Server-SLE_5.2_x86_64/",
+                "/SUSE_Updates_MultiLinuxManagerTools_SLE-15_x86_64/",
+                "/SUSE_Updates_SLE-Module-Server-Applications_15-SP7_x86_64/",
+                "/SUSE_Updates_SLE-Module-Basesystem_15-SP7_x86_64/",
+                "/SUSE_Updates_SLE-Module-Containers_15-SP7_x86_64/",
+                "/SUSE_Updates_SLE-Module-Python3_15-SP7_x86_64/"},
+}
+
+v52_uyuni_tools_micro_repos: Dict[str, Dict[str, str]] = {
+    "server": {
+        "server_uyuni_tools": "/SLFO:/Products:/Multi-Linux-Manager:/5.2:/ToTest/product/repo/Multi-Linux-Manager-Server-5.2-x86_64/"},
+    "proxy": {
+        "proxy_uyuni_tools": "/SLFO:/Products:/Multi-Linux-Manager:/5.2:/ToTest/product/repo/Multi-Linux-Manager-Proxy-5.2-x86_64/",
+        "retail_uyuni_tools": "/SLFO:/Products:/Multi-Linux-Manager:/5.2:/ToTest/product/repo/Multi-Linux-Manager-Retail-Branch-Server-5.2-x86_64/",
+        "slmicro6_client_tools": "/SLFO:/Products:/MultiLinuxManagerTools:/SL-Micro-6:/ToTest/product/repo/Multi-Linux-ManagerTools-SL-Micro-6-x86_64/"
+    }
+}
+
+def get_v52_static_and_client_tools(variant: str = "micro") -> (Dict[str, Dict[str, str]], Dict[str, List[str]]):
+    # 1. Initialize static repositories using the shared 5.1 client tools
+    static_repos: Dict[str, Dict[str, str]] = {
+        key: {name: f"{IBS_URL_PREFIX}{path}" for name, path in subdict.items()}
+        for key, subdict in v51_nodes_static_client_tools_repositories.items()
+    }
+
+    # 2. Initialize dynamic repositories using the shared 5.1 client tools
+    dynamic_maintenance_repos: Dict[str, Set[str]] = {
+        key: set(paths) for key, paths in v51_nodes_dynamic_client_tools_repos.items()
+    }
+
+    # 3. Select 5.2 Uyuni tools based on variant and merge
+    if variant == "micro":
+        uyuni_tools = v52_uyuni_tools_micro_repos
+        for key in ("server", "proxy"):
+            if key not in static_repos:
+                static_repos[key] = {}
+            for name, path in uyuni_tools.get(key, {}).items():
+                static_repos[key][name] = f"{IBS_URL_PREFIX}{path}"
+
+    elif variant == "sles":
+        uyuni_tools = v52_uyuni_tools_sles_repos
+        for key in ("server", "proxy"):
+            if key not in dynamic_maintenance_repos:
+                dynamic_maintenance_repos[key] = set()
+            for path in uyuni_tools.get(key, set()):
+                dynamic_maintenance_repos[key].add(path)
+
+    else:
+        raise ValueError(f"Invalid variant '{variant}'. Choose from: 'micro', 'sles'")
+
+    return static_repos, dynamic_maintenance_repos