Merge branch 'packit:main' into mkyral-ewa

Author: martinky82

Containerfile.c10s

@@ -38,6 +38,7 @@ RUN dnf -y install --allowerasing \
       sed \
       gawk \
       rsync \
+      python3-tabulate \
     && dnf clean all
 
 RUN pip3 install --no-cache-dir \
@@ -46,7 +47,9 @@ RUN pip3 install --no-cache-dir \
       openinference-instrumentation-beeai \
       arize-phoenix-otel \
       redis \
-      specfile
+      specfile \
+      pytest \
+      pytest-asyncio
 
 # Create user
 RUN useradd -m -G wheel beeai

Makefile

@@ -27,8 +27,12 @@ run-triage-agent-standalone:
 		-e MOCK_JIRA=$(MOCK_JIRA) \
 		triage-agent
 
-
-
+.PHONY: run-triage-agent-e2e-tests
+run-triage-agent-e2e-tests:
+	$(COMPOSE_AGENTS) run --rm \
+		-e MOCK_JIRA="true" \
+		-e DRY_RUN=$(DRY_RUN) \
+		triage-agent-e2e-tests
 
 .PHONY: run-rebase-agent-c9s-standalone
 run-rebase-agent-c9s-standalone:

README-agents.md

@@ -19,6 +19,23 @@ Three agents process tasks through Redis queues:
 - **Modify JIRA issues** (add comments, update fields, apply labels)
 - **Create GitLab merge requests** and push commits
 
+## Jira mocking
+
+If you clone testing Jira files from
+`[email protected]:jotnar-project/testing-jiras.git`
+you can use them to work with instead of real Jira server.
+
+Example:
+
+`make run-triage-agent-standalone JIRA_ISSUE=RHEL-15216 MOCK_JIRA=true`
+
+If used together with `DRY_RUN`, the agents won't edit the Jira files,
+otherwise they will.
+
+Example:
+
+`make run-triage-agent-standalone JIRA_ISSUE=RHEL-15216 DRY_RUN=true MOCK_JIRA=true`
+
 ## Setup
 
 ### Required API Tokens & Authentication

agents/backport_agent.py

@@ -37,6 +37,8 @@
     LogInputSchema,
     LogOutputSchema,
     Task,
+    BackportData,
+    ErrorData,
 )
 from common.utils import redis_client, fix_await
 from constants import I_AM_JOTNAR, CAREFULLY_REVIEW_CHANGES
@@ -68,7 +70,6 @@
     GitPatchCreationTool,
     GitPreparePackageSources,
 )
-from triage_agent import BackportData, ErrorData
 from utils import (
     check_subprocess,
     get_agent_execution_config,
@@ -313,11 +314,13 @@ def get_fix_build_error_prompt() -> str:
 
       The package built successfully before your patches were added - the spec file and build configuration are correct.
       Your task is to fix this build error by improving the patches - NOT by modifying the spec file.
+      This includes BOTH compilation errors AND test failures during the check section.
       Make ONE attempt to fix the issue - you will be called again if the build still fails.
 
       Follow these steps:
 
       STEP 1: Analyze the build error
+      - Identify if it's a compilation error (undefined symbols, headers) or test failure (in check section)
       - Identify what's missing: undefined functions, types, macros, symbols, headers, or API changes
       - Look for patterns like "undefined reference", "implicit declaration", "undeclared identifier", etc.
       - Note the specific names of missing symbols
@@ -366,6 +369,13 @@ def get_fix_build_error_prompt() -> str:
       - Cherry-pick some commits, then manually adapt code where needed
       - Use the upstream repo as a reference while writing your own backport
 
+      SPECIAL CONSIDERATIONS FOR TEST FAILURES:
+      - Tests validate the fix - they MUST pass
+      - If tests use missing functions/helpers: backport ONLY the minimal necessary test helpers
+        (search upstream history for test utility commits and cherry-pick or manually add them)
+      - If tests fail due to API changes: adapt test code to work with older APIs
+      - NEVER skip or disable tests - fix them instead
+
       STEP 4: Regenerate the patch
       - After making your fixes (cherry-picked or manual), regenerate the patch file
       - Use `generate_patch_from_commit` tool with the PATCHED_BASE commit
@@ -401,10 +411,11 @@ def get_fix_build_error_prompt() -> str:
       - Work in the EXISTING {{local_clone}}-upstream directory (don't clone again)
       - NEVER modify the spec file - build failures are caused by incomplete patches, not spec issues
       - The ONLY dist-git file you can modify is {{jira_issue}}.patch (by regenerating it from upstream repo)
-      - Fix build errors by adding missing prerequisites/dependencies to your patches in upstream repo
+      - Fix build errors (compilation AND test failures) by adding missing prerequisites/dependencies to your patches in upstream repo
+      - For test failures: backport minimal necessary test helpers/functions to make tests pass
       - You can freely explore, edit, cherry-pick, and commit in the upstream repo - it's your workspace
       - Use the upstream repo as a rich source of information and examples
-      - Be creative and pragmatic - the goal is a working build, not perfect git history
+      - Be creative and pragmatic - the goal is a working build with passing tests, not perfect git history
       - Make ONE solid attempt to fix the issue - if the build fails, report the error clearly
       - Your work will persist in the upstream repo for the next attempt if needed
 

agents/build_agent.py

@@ -34,7 +34,8 @@ def get_instructions() -> str:
       using the `download_artifacts` tool to the current directory. If there are no log files,
       just return the error message. Otherwise, start with `builder-live.log` and try to identify
       the build failure. If not found, try the same with `root.log`. Summarize the findings
-      and return them as `error`. If the build failed due to a build timeout, set `is_timeout` to `true` in your output.
+      and return them as `error`. If the build failed due to a build timeout, set `is_timeout` to `true`
+      in your output. Remove the downloaded *.log.gz files, if any.
 
       General instructions:
 

agents/log_agent.py

@@ -46,6 +46,10 @@ def get_instructions() -> str:
          and a line referencing the Jira issue. Use "- Resolves: <JIRA_ISSUE>" unless
          the spec file has historically used a different style.
 
+         IMPORTANT: The changelog entry should focus on user-facing changes only. Do not mention
+         technical packaging details such as added/removed patches, changed BuildRequires,
+         or other spec file modifications that are not visible to end users.
+
       4. Generate a title for commit message and merge request. It should be descriptive
          but shouldn't be longer than 80 characters.
 

agents/metrics_middleware.py

@@ -0,0 +1,44 @@
+from datetime import datetime
+
+from beeai_framework.context import (
+    RunContextStartEvent,
+    RunContextFinishEvent,
+    RunMiddlewareProtocol,
+    RunContext
+)
+from beeai_framework.emitter import EmitterOptions, EventMeta
+from beeai_framework.emitter.utils import create_internal_event_matcher
+
+
+class MetricsMiddleware(RunMiddlewareProtocol):
+    def __init__(self) -> None:
+        self.start_time: datetime | None = None
+        self.end_time: datetime | None = None
+        self.tool_calls: int = 0
+
+    def bind(self, ctx: RunContext) -> None:
+        ctx.emitter.on(
+            create_internal_event_matcher("start", ctx.instance),
+            self._on_run_context_start,
+            EmitterOptions(is_blocking=True, priority=1),
+        )
+        ctx.emitter.on(
+            create_internal_event_matcher("finish", ctx.instance),
+            self._on_run_context_finish,
+            EmitterOptions(is_blocking=True, priority=1),
+        )
+
+    async def _on_run_context_start(self, event: RunContextStartEvent, meta: EventMeta) -> None:
+        self.start_time = datetime.now()
+
+    async def _on_run_context_finish(self, event: RunContextFinishEvent, meta: EventMeta) -> None:
+        self.end_time = datetime.now()
+
+    @property
+    def duration(self) -> float:
+        if self.start_time and self.end_time:
+            return (self.end_time - self.start_time).total_seconds()
+        return 0
+
+    def get_metrics(self) -> dict[str, float]:
+        return {"duration": self.duration}

agents/package_update_steps.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field
 from pathlib import Path
 
-from common.constants import JiraLabels
+from common.constants import JiraLabels, GITLAB_MR_CHECKLIST
 from common.config import load_rhel_config
 from common.models import LogOutputSchema
 
@@ -143,6 +143,7 @@ async def create_merge_request_checklist(state, next_step, dry_run, gateway_tool
               await tasks.run_tool(
                   "create_merge_request_checklist",
                   merge_request_url=state.merge_request_url,
+                  note_body=GITLAB_MR_CHECKLIST,
                   available_tools=gateway_tools,
               )
               logger.info(f"Created checklist for MR {state.merge_request_url}")

agents/tasks.py

@@ -9,9 +9,9 @@
 
 from common.models import LogOutputSchema, CachedMRMetadata
 from common.utils import is_cs_branch
-from constants import BRANCH_PREFIX, JIRA_COMMENT_TEMPLATE
-from utils import check_subprocess, run_subprocess, run_tool, mcp_tools
-from tools.specfile import UpdateReleaseTool
+from agents.constants import BRANCH_PREFIX, JIRA_COMMENT_TEMPLATE
+from agents.utils import check_subprocess, run_subprocess, run_tool, mcp_tools
+from agents.tools.specfile import UpdateReleaseTool
 
 logger = logging.getLogger(__name__)
 
@@ -29,7 +29,8 @@ async def fork_and_prepare_dist_git(
     repository = f"https://gitlab.com/redhat/{namespace}/rpms/{package}"
     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 local_clone.is_dir():
+        shutil.rmtree(local_clone, ignore_errors=False)
     if not is_cs_branch(dist_git_branch):
         await run_tool(
             "create_zstream_branch",
@@ -50,7 +51,8 @@ async def fork_and_prepare_dist_git(
     if with_fedora:
         try:
             fedora_clone = working_dir / f"{package}-fedora"
-            shutil.rmtree(fedora_clone, ignore_errors=True)
+            if fedora_clone.is_dir():
+                shutil.rmtree(fedora_clone, ignore_errors=False)
             await check_subprocess(
                 ["git", "clone", "--single-branch", "--branch", "rawhide", f"https://src.fedoraproject.org/rpms/{package}", f"{package}-fedora"],
                 cwd=working_dir,

agents/tests/e2e/conftest.py

@@ -0,0 +1,16 @@
+from typing import Generator
+
+
+import pytest
+
+
+@pytest.hookimpl(wrapper=True)
+def pytest_terminal_summary(
+    terminalreporter: pytest.TerminalReporter, exitstatus, config: pytest.Config
+) -> Generator:
+    yield
+    metrics = config.stash.get("metrics", None)
+
+    if metrics:
+        terminalreporter.write_sep("=", "Metrics")
+        terminalreporter.write_line(metrics, flush=True)