Automatically create missing Z-Stream branches

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

Author: nforro

Containerfile.mcp

@@ -40,4 +40,8 @@ WORKDIR $HOME
 
 ENV PYTHONPATH=$HOME:$PYTHONPATH
 
+RUN mkdir ~/.ssh \
+      && chmod 0700 ~/.ssh \
+      && ssh-keyscan pkgs.devel.redhat.com >> ~/.ssh/known_hosts
+
 CMD ["/bin/bash"]

agents/constants.py

@@ -1,8 +1,6 @@
 from enum import Enum
 from string import Template
 
-BREWHUB_URL = "https://brewhub.engineering.redhat.com/brewhub"
-
 BRANCH_PREFIX = "automated-package-update"
 
 AGENT_WARNING = (

agents/tasks.py

@@ -31,6 +31,13 @@ async def fork_and_prepare_dist_git(
     fork_url = await run_tool("fork_repository", repository=repository, available_tools=available_tools)
     local_clone = working_dir / package
     shutil.rmtree(local_clone, ignore_errors=True)
+    if not is_cs_branch(dist_git_branch):
+        await run_tool(
+            "create_zstream_branch",
+            package=package,
+            branch=dist_git_branch,
+            available_tools=available_tools,
+        )
     await run_tool(
         "clone_repository",
         repository=repository,

agents/tools/specfile.py

@@ -13,8 +13,8 @@
 from beeai_framework.emitter import Emitter
 from beeai_framework.tools import StringToolOutput, Tool, ToolError, ToolRunOptions
 
+from common.constants import BREWHUB_URL
 from common.validators import NonEmptyString
-from constants import BREWHUB_URL
 from utils import get_absolute_path
 
 

common/constants.py

@@ -1,5 +1,8 @@
 from enum import Enum
 
+BREWHUB_URL = "https://brewhub.engineering.redhat.com/brewhub"
+
+
 class RedisQueues(Enum):
     """Constants for Redis queue names used by Jotnar agents"""
     TRIAGE_QUEUE = "triage_queue"

mcp_server/distgit_tools.py

@@ -0,0 +1,75 @@
+import asyncio
+import os
+import tempfile
+import time
+from typing import Annotated
+
+import git
+import koji
+from fastmcp.exceptions import ToolError
+from pydantic import Field
+
+from common.constants import BREWHUB_URL
+from common.utils import init_kerberos_ticket, KerberosError
+
+SYNC_TIMEOUT = 1 * 60 * 60  # seconds
+
+
+async def create_zstream_branch(
+    package: Annotated[str, Field(description="Package name")],
+    branch: Annotated[str, Field(description="Name of the branch to create")]
+) -> str:
+    """
+    Creates a new Z-Stream branch for the specified package in internal dist-git.
+    """
+    try:
+        principal = await init_kerberos_ticket()
+    except KerberosError as e:
+        raise ToolError(f"Failed to initialize Kerberos ticket: {e}") from e
+    username = principal.split("@", maxsplit=1)[0]
+    try:
+        with tempfile.TemporaryDirectory() as path:
+            repo = await asyncio.to_thread(
+                git.Repo.clone_from,
+                f"ssh://{username}@pkgs.devel.redhat.com/rpms/{package}",
+                path,
+            )
+            if branch in [ref.name.split("/")[-1] for ref in repo.remotes.origin.refs]:
+                return f"Z-Stream branch {branch} already exists, no need to create it"
+            # find the correct base for our new branch:
+            # - get candidate tag corresponding to the branch
+            # - get the latest build the candidate tag inherited (from Y-Stream or previous Z-Stream)
+            # - get the ref the inherited build originated from
+            # - use that as a base for the new branch
+            # this allows us to create Z-Stream branches even if a higher Z-Stream branch already exists
+            session = koji.ClientSession(BREWHUB_URL)
+            candidate_tag = f"{branch}-candidate"
+            builds = await asyncio.to_thread(
+                session.listTagged,
+                package=package,
+                tag=candidate_tag,
+                latest=True,
+                inherit=True,
+                strict=True,
+            )
+            if not builds:
+                raise RuntimeError(f"There are no builds of {package} in {candidate_tag}")
+            [build] = builds
+            metadata = await asyncio.to_thread(session.getBuild, build["build_id"], strict=True)
+            ref = metadata["source"].split("#")[-1]
+            await asyncio.to_thread(repo.remotes.origin.push, f"{ref}:refs/heads/{branch}")
+            # wait until the new branch is synced to GitLab
+            token = os.environ["GITLAB_TOKEN"]
+            start_time = time.monotonic()
+            while time.monotonic() - start_time < SYNC_TIMEOUT:
+                if await asyncio.to_thread(
+                    repo.git.ls_remote,
+                    f"https://oauth2:{token}@gitlab.com/redhat/rhel/rpms/{package}",
+                    branch,
+                    branches=True,
+                ):
+                    return f"Succesfully created Z-Stream branch {branch}"
+                await asyncio.sleep(30)
+            raise RuntimeError(f"The {branch} branch wasn't synced to GitLab after {SYNC_TIMEOUT} seconds")
+    except Exception as e:
+        raise ToolError(f"Failed to create Z-Stream branch: {e}") from e

mcp_server/gateway.py

@@ -5,6 +5,7 @@
 from fastmcp import FastMCP
 
 import copr_tools
+import distgit_tools
 import gitlab_tools
 import jira_tools
 import lookaside_tools
@@ -14,7 +15,7 @@
     name="MCP Gateway",
     tools=[
         coroutine
-        for module in [copr_tools, gitlab_tools, jira_tools, lookaside_tools]
+        for module in [copr_tools, distgit_tools, gitlab_tools, jira_tools, lookaside_tools]
         for name, coroutine in inspect.getmembers(module, inspect.iscoroutinefunction)
         if coroutine.__module__ == module.__name__
         and not name.startswith("_")