Use correct Copr chroot for 0-day Z-Streams

Signed-off-by: Nikola Forró <[email protected]>

Author: nforro

agents/tools/version_mapper.py

@@ -58,11 +58,13 @@ async def _run(
 
         config = await load_rhel_config()
 
-        z_streams = config.get("current_z_streams", {})
-        y_streams = config.get("current_y_streams", {})
+        upcoming_z_streams = config.get("upcoming_z_streams", {})
+        current_z_streams = config.get("current_z_streams", {})
+        current_y_streams = config.get("current_y_streams", {})
 
-        y_stream = y_streams.get(major_version_str)
-        z_stream = z_streams.get(major_version_str)
+        y_stream = current_y_streams.get(major_version_str)
+        # 0-day Z-Stream during stabilization phase, regular Z-Stream otherwise
+        z_stream = upcoming_z_streams.get(major_version_str) or current_z_streams.get(major_version_str)
         is_maintenance_version = y_stream is None
 
         return VersionMapperOutput(VersionMapperResult(

mcp_server/copr_tools.py

@@ -13,7 +13,8 @@
 from fastmcp.exceptions import ToolError
 from pydantic import BaseModel, Field
 
-from common.utils import init_kerberos_ticket, KerberosError, is_cs_branch
+from common import load_rhel_config
+from common.utils import init_kerberos_ticket, KerberosError
 from common.validators import AbsolutePath
 
 COPR_CONFIG = {
@@ -56,13 +57,22 @@ def read_header():
     return (COPR_ARCHES - exclude_arches) & exclusive_arches
 
 
-def _branch_to_chroot(dist_git_branch: str) -> str:
-    m = re.match(r"^c(\d+)s|rhel-(\d+)-main|rhel-(\d+)\.\d+.*$", dist_git_branch)
-    if not m:
+async def _branch_to_chroot(dist_git_branch: str) -> str:
+    if not (m := re.match(r"^(?:c(\d+)s|rhel-(\d+)-main|rhel-(\d+)\.(\d+).*)$", dist_git_branch)):
         raise ValueError(f"Unsupported branch name: {dist_git_branch}")
-    majorver = next(g for g in m.groups() if g is not None)
-    # build only cNs against target with .dev suffix
-    suffix = ".dev" if is_cs_branch(dist_git_branch) else ""
+    majorver, minorver = m.group(1) or m.group(2) or m.group(3), m.group(4)
+    rhel_config = await load_rhel_config()
+    upcoming_z_streams = rhel_config.get("upcoming_z_streams", {})
+    # build Y-Streams and 0-day Z-Streams against the dev chroot
+    if minorver is not None:
+        if (ver := upcoming_z_streams.get(majorver)) and ver.startswith(
+            f"rhel-{majorver}.{minorver}"
+        ):
+            suffix = ".dev"
+        else:
+            suffix = ""
+    else:
+        suffix = ".dev"
     return f"rhel-{majorver}{suffix}"
 
 
@@ -85,7 +95,7 @@ async def build_package(
     # in such case build for either of them
     build_arch = exclusive_arches.pop() if exclusive_arches else "x86_64"
     try:
-        chroot = _branch_to_chroot(dist_git_branch) + f"-{build_arch}"
+        chroot = (await _branch_to_chroot(dist_git_branch)) + f"-{build_arch}"
     except ValueError as e:
         raise ToolError(f"Failed to deduce Copr chroot: {e}") from e
     project_proxy = ProjectProxy({"username": copr_user, **COPR_CONFIG})

mcp_server/jira_tools.py

@@ -229,15 +229,17 @@ async def check_cve_triage_eligibility(
         )
 
     rhel_config = await load_rhel_config()
+    upcoming_z_streams = rhel_config.get("upcoming_z_streams", {})
     current_z_streams = rhel_config.get("current_z_streams", {})
+    latest_z_streams = current_z_streams | upcoming_z_streams
 
     needs_internal_fix = False
     severity = fields.get(SEVERITY_CUSTOM_FIELD, {}).get("value", "")
 
-    # Check if z-stream is not in current z-streams - always needs internal fix
-    if target_version.lower() not in [v.lower() for v in current_z_streams.values()]:
+    # Check if z-stream is not in latest z-streams - always needs internal fix
+    if target_version.lower() not in [v.lower() for v in latest_z_streams.values()]:
         needs_internal_fix = True
-        reason = f"Z-stream CVE ({target_version}) not in current z-streams, needs RHEL fix first"
+        reason = f"Z-stream CVE ({target_version}) not in latest z-streams, needs RHEL fix first"
     # Determine if internal fix is needed based on severity
     elif severity not in [Severity.LOW.value, Severity.MODERATE.value]:
         needs_internal_fix = True

mcp_server/tests/unit/test_copr.py

@@ -26,18 +26,28 @@
     "exclusive_arch",
     [None, "ppc64le"],
 )
+@pytest.mark.parametrize(
+    "dist_git_branch",
+    ["c10s", "rhel-10.1", "rhel-10.0"],
+)
 @pytest.mark.asyncio
-async def test_build_package(build_failure, exclusive_arch):
+async def test_build_package(build_failure, exclusive_arch, dist_git_branch):
     ownername = "jotnar-bot"
     srpm_path = Path("test.src.rpm")
-    dist_git_branch = "c10s"
     jira_issue = "RHEL-12345"
-    chroot = f"rhel-10.dev-{exclusive_arch or 'x86_64'}"
-    existing_chroot = f"rhel-9.dev-{exclusive_arch or 'x86_64'}"
+    suffix = "" if dist_git_branch == "rhel-10.0" else ".dev"
+    chroot = f"rhel-10{suffix}-{exclusive_arch or 'x86_64'}"
+    existing_chroot = "rhel-9.dev-x86_64"
 
     async def init_kerberos_ticket():
         return f"{ownername}@EXAMPLE.COM"
 
+    async def load_rhel_config():
+        return {
+            "current_z_streams": {"10": "rhel-10.0.z"},
+            "upcoming_z_streams": {"10": "rhel-10.1.z"},
+        }
+
     async def _get_exclusive_arches(*_):
         return {exclusive_arch} if exclusive_arch else set()
 
@@ -46,6 +56,7 @@ async def sleep(*_):
         return
 
     flexmock(copr_tools).should_receive("init_kerberos_ticket").replace_with(init_kerberos_ticket).once()
+    flexmock(copr_tools).should_receive("load_rhel_config").replace_with(load_rhel_config).once()
     flexmock(copr_tools).should_receive("_get_exclusive_arches").replace_with(_get_exclusive_arches).once()
     flexmock(asyncio).should_receive("sleep").replace_with(sleep)
 

templates/rhel-config.json

@@ -5,6 +5,10 @@
     },
     "current_z_streams": {
       "8": "rhel-8.10.z",
+      "9": "rhel-9.6.z",
+      "10": "rhel-10.0.z"
+    },
+    "upcoming_z_streams": {
       "9": "rhel-9.7.z",
       "10": "rhel-10.1.z"
     },