backporting accepts a list of patches

for standalone, you now need to pass UPSTREAM_PATCHES and not
UPSTREAM_FIX

Resolves packit/jotnar#109

Signed-off-by: Tomas Tomecek <[email protected]>
Co-authored-by: Nikola Forró <[email protected]>
Assisted-by: Cursor(Claude)

Author: TomasTomecek

Makefile

@@ -59,7 +59,7 @@ run-rebase-agent-standalone: run-rebase-agent-c10s-standalone
 run-backport-agent-c9s-standalone:
 	$(COMPOSE_AGENTS)  run --rm \
 		-e PACKAGE=$(PACKAGE) \
-		-e UPSTREAM_FIX=$(UPSTREAM_FIX) \
+		-e UPSTREAM_PATCHES=$(UPSTREAM_PATCHES) \
 		-e JIRA_ISSUE=$(JIRA_ISSUE) \
 		-e BRANCH=$(BRANCH) \
 		-e DRY_RUN=$(DRY_RUN) \
@@ -70,7 +70,7 @@ run-backport-agent-c9s-standalone:
 run-backport-agent-c10s-standalone:
 	$(COMPOSE_AGENTS) run --rm \
 		-e PACKAGE=$(PACKAGE) \
-		-e UPSTREAM_FIX=$(UPSTREAM_FIX) \
+		-e UPSTREAM_PATCHES=$(UPSTREAM_PATCHES) \
 		-e JIRA_ISSUE=$(JIRA_ISSUE) \
 		-e BRANCH=$(BRANCH) \
 		-e DRY_RUN=$(DRY_RUN) \

README-agents.md

@@ -73,12 +73,14 @@ make trigger-pipeline JIRA_ISSUE=RHEL-12345
 # Test specific agents standalone
 make JIRA_ISSUE=RHEL-12345 run-triage-agent-standalone
 make PACKAGE=httpd VERSION=2.4.62 JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-rebase-agent-standalone
-make PACKAGE=httpd UPSTREAM_FIX=https://github.com/... JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-backport-agent-standalone
+make PACKAGE=httpd UPSTREAM_PATCHES=https://github.com/... JIRA_ISSUE=RHEL-12345 BRANCH=c10s run-backport-agent-standalone
 
 # Or with dry-run
 DRY_RUN=true make JIRA_ISSUE=RHEL-12345 run-triage-agent-standalone
 ```
 
+Use commas to delimit multiple patch/commit URLs in `UPSTREAM_PATCHES`.
+
 **Monitoring:**
 - Phoenix tracing: http://localhost:6006/
 - Redis queue monitoring: http://localhost:8081/

agents/backport_agent.py

@@ -86,7 +86,7 @@ def get_instructions() -> str:
     return """
       You are an expert on backporting upstream patches to packages in RHEL ecosystem.
 
-      To backport upstream fix <UPSTREAM_FIX> to package <PACKAGE> in dist-git branch <DIST_GIT_BRANCH>, do the following:
+      To backport upstream patches <UPSTREAM_PATCHES> to package <PACKAGE> in dist-git branch <DIST_GIT_BRANCH>, do the following:
 
       CRITICAL: Do NOT modify, delete, or touch any existing patches in the dist-git repository.
       Only add new patches for the current backport. Existing patches are there for a reason
@@ -97,7 +97,7 @@ def get_instructions() -> str:
          end the process with `success=True` and `status="Backport already applied"`.
 
       2. Use the `git_prepare_package_sources` tool to prepare package sources in directory <UNPACKED_SOURCES>
-         for application of the upstream fix.
+         for application of the upstream patch.
 
       3. Determine which backport approach to use:
 
@@ -108,7 +108,7 @@ def get_instructions() -> str:
             - <UPSTREAM_REPO>: A temporary upstream repository clone (created in step 3c with -upstream suffix)
 
             When to use this workflow:
-            - <UPSTREAM_FIX> is a commit or pull request URL
+            - <UPSTREAM_PATCHES> is a list of commit or pull request URLs
             - This includes URLs with .patch suffix (e.g., https://github.com/.../commit/abc123.patch)
             - If URL extraction fails, fall back to approach B
 
@@ -218,22 +218,26 @@ def get_instructions() -> str:
 
          B. GIT AM WORKFLOW (Fallback approach):
 
-            Note: For this workflow, use the pre-downloaded patch file at {{local_clone}}/{{jira_issue}}.patch
+            Note: For this workflow, use the pre-downloaded patch files in the current working directory.
+            They are called `<JIRA_ISSUE>-<N>.patch` where <N> is a 0-based index. For example,
+            for a `RHEL-12345` Jira issue the first patch would be called `RHEL-12345-0.patch`.
 
-            3a. Backport the patch:
-                - Use the `git_patch_apply` tool with the patch file: {{local_clone}}/{{jira_issue}}.patch
+            Backport all patches individually using the steps 3a and 3b below.
+
+            3a. Backport one patch at a time using the following steps:
+                - Use the `git_patch_apply` tool with the patch file: <JIRA_ISSUE>-<N>.patch
                 - Resolve all conflicts and leave the repository in a dirty state. Delete all *.rej files.
                 - Use the `git_apply_finish` tool to finish the patch application.
 
             3b. Once there are no more conflicts, use the `git_patch_create` tool with the patch file path
-                {{local_clone}}/{{jira_issue}}.patch to update the patch file.
+                <JIRA_ISSUE>-<N>.patch to update the patch file.
 
-      4. Update the spec file. Add a new `Patch` tag pointing to the <UPSTREAM_FIX> patch file.
+      4. Update the spec file. Add a new `Patch` tag for every patch in <UPSTREAM_PATCHES>.
          Add the new `Patch` tag after all existing `Patch` tags and, if `Patch` tags are numbered,
          make sure it has the highest number. Make sure the patch is applied in the "%prep" section
          and the `-p` argument is correct. Add an upstream URL as a comment above
          the `Patch:` tag - this URL references the related upstream commit or a pull/merge request.
-         Default to <UPSTREAM_FIX> if it is an URL.
+         Include every patch defined in <UPSTREAM_PATCHES> list.
          IMPORTANT: Only ADD new patches. Do NOT modify existing Patch tags or their order.
 
       5. Run `centpkg --name=<PACKAGE> --namespace=rpms --release=<DIST_GIT_BRANCH> prep` to see if the new patch
@@ -269,7 +273,10 @@ def get_prompt() -> str:
       {{dist_git_branch}} dist-git branch has been checked out. You are working on Jira issue {{jira_issue}}
       {{#cve_id}}(a.k.a. {{.}}){{/cve_id}}.
       {{^build_error}}
-      Backport upstream fix {{upstream_fix}}.
+      Backport upstream patches:
+      {{#upstream_patches}}
+      - {{.}}
+      {{/upstream_patches}}
       Unpacked upstream sources are in {{unpacked_sources}}.
       {{/build_error}}
       {{#build_error}}
@@ -289,7 +296,12 @@ def get_fix_build_error_prompt() -> str:
       {{dist_git_branch}} dist-git branch has been checked out. You are working on Jira issue {{jira_issue}}
       {{#cve_id}}(a.k.a. {{.}}){{/cve_id}}.
 
-      The backport of {{upstream_fix}} was initially successful using the cherry-pick workflow,
+      Upstream patches that were backported:
+      {{#upstream_patches}}
+      - {{.}}
+      {{/upstream_patches}}
+
+      The backport of upstream patches was initially successful using the cherry-pick workflow,
       but the build failed with the following error:
 
       {{build_error}}
@@ -492,7 +504,7 @@ async def main() -> None:
     local_tool_options = {"working_directory": None}
 
     class State(PackageUpdateState):
-        upstream_fix: str
+        upstream_patches: list[str]
         cve_id: str | None
         unpacked_sources: Path | None = Field(default=None)
         backport_log: list[str] = Field(default=[])
@@ -502,7 +514,7 @@ class State(PackageUpdateState):
         incremental_fix_attempts: int = Field(default=0)  # Track how many times we tried incremental fix
 
     async def run_workflow(
-        package, dist_git_branch, upstream_fix, jira_issue, cve_id, redis_conn=None
+        package, dist_git_branch, upstream_patches, jira_issue, cve_id, redis_conn=None
     ):
         local_tool_options["working_directory"] = None
 
@@ -545,11 +557,14 @@ async def fork_and_prepare_dist_git(state):
                 state.unpacked_sources = get_unpacked_sources(state.local_clone, state.package)
                 timeout = aiohttp.ClientTimeout(total=30)
                 async with aiohttp.ClientSession(timeout=timeout) as session:
-                    async with session.get(state.upstream_fix) as response:
-                        if response.status < 400:
-                            (state.local_clone / f"{state.jira_issue}.patch").write_text(await response.text())
-                        else:
-                            raise ValueError(f"Failed to fetch upstream fix: {response.status}")
+                    for idx, upstream_patch in enumerate(state.upstream_patches):
+                        # should we guess the patch name with log agent?
+                        patch_name = f"{state.jira_issue}-{idx}.patch"
+                        async with session.get(upstream_patch) as response:
+                            if response.status < 400:
+                                (state.local_clone / patch_name).write_text(await response.text())
+                            else:
+                                raise ValueError(f"Failed to fetch upstream patch: {response.status}")
                 return "run_backport_agent"
 
             async def run_backport_agent(state):
@@ -563,7 +578,7 @@ async def run_backport_agent(state):
                             dist_git_branch=state.dist_git_branch,
                             jira_issue=state.jira_issue,
                             cve_id=state.cve_id,
-                            upstream_fix=state.upstream_fix,
+                            upstream_patches=state.upstream_patches,
                             build_error=state.build_error,
                         ),
                     ),
@@ -624,7 +639,7 @@ async def fix_build_error(state):
                                 dist_git_branch=state.dist_git_branch,
                                 jira_issue=state.jira_issue,
                                 cve_id=state.cve_id,
-                                upstream_fix=state.upstream_fix,
+                                upstream_patches=state.upstream_patches,
                                 build_error=state.build_error,
                             ),
                         ),
@@ -774,21 +789,22 @@ async def run_log_agent(state):
                         log_output=log_output,
                         operation_type="backport",
                         package=state.package,
-                        details=state.upstream_fix,
+                        details=str(state.upstream_patches),
                     )
                 state.log_result = log_output
 
                 return "stage_changes"
 
             async def commit_push_and_open_mr(state):
                 try:
+                    formatted_patches = "\n".join(f" - {p}" for p in state.upstream_patches)
                     state.merge_request_url = await tasks.commit_push_and_open_mr(
                         local_clone=state.local_clone,
                         commit_message=(
                             f"{state.log_result.title}\n\n"
                             f"{state.log_result.description}\n\n"
                             + (f"CVE: {state.cve_id}\n" if state.cve_id else "")
-                            + f"Upstream fix: {state.upstream_fix}\n"
+                            + "Upstream patches:\n" + formatted_patches + "\n"
                             + f"Resolves: {state.jira_issue}\n\n"
                             f"This commit was backported {I_AM_JOTNAR}\n\n"
                             "Assisted-by: Jotnar\n"
@@ -801,7 +817,7 @@ async def commit_push_and_open_mr(state):
                             f"This merge request was created {I_AM_JOTNAR}\n"
                             f"{CAREFULLY_REVIEW_CHANGES}\n\n"
                             f"{state.log_result.description}\n\n"
-                            f"Upstream patch: {state.upstream_fix}\n\n"
+                            + "Upstream patches:\n" + formatted_patches + "\n"
                             f"Resolves: {state.jira_issue}\n\n"
                             f"Backporting steps:\n\n{state.backport_log[-1]}"
                         ),
@@ -849,7 +865,7 @@ async def comment_in_jira(state):
                 State(
                     package=package,
                     dist_git_branch=dist_git_branch,
-                    upstream_fix=upstream_fix,
+                    upstream_patches=upstream_patches,
                     jira_issue=jira_issue,
                     cve_id=cve_id,
                 ),
@@ -859,14 +875,15 @@ async def comment_in_jira(state):
     if (
         (package := os.getenv("PACKAGE", None))
         and (branch := os.getenv("BRANCH", None))
-        and (upstream_fix := os.getenv("UPSTREAM_FIX", None))
+        and (upstream_patches_raw := os.getenv("UPSTREAM_PATCHES", None))
         and (jira_issue := os.getenv("JIRA_ISSUE", None))
     ):
+        upstream_patches = upstream_patches_raw.split(",")
         logger.info("Running in direct mode with environment variables")
         state = await run_workflow(
             package=package,
             dist_git_branch=branch,
-            upstream_fix=upstream_fix,
+            upstream_patches=upstream_patches,
             jira_issue=jira_issue,
             cve_id=os.getenv("CVE_ID", None),
             redis_conn=None,
@@ -928,7 +945,7 @@ async def retry(task, error):
                 state = await run_workflow(
                     package=backport_data.package,
                     dist_git_branch=dist_git_branch,
-                    upstream_fix=backport_data.patch_url,
+                    upstream_patches=backport_data.patch_urls,
                     jira_issue=backport_data.jira_issue,
                     cve_id=backport_data.cve_id,
                     redis_conn=redis,

common/models.py

@@ -95,7 +95,8 @@ class BackportInputSchema(BaseModel):
     dist_git_branch: str = Field(description="Git branch in dist-git to be updated")
     jira_issue: str = Field(description="Jira issue to reference as resolved")
     cve_id: str | None = Field(default=None, description="CVE ID if the jira issue is a CVE")
-    upstream_fix: str = Field(description="URL to the upstream fix (commit URL or patch URL)")
+    upstream_patches: list[str] = Field(
+        description="List of URLs to upstream patches that were validated using the PatchValidator tool")
     build_error: str | None = Field(description="Error encountered during package build")
 
 
@@ -273,4 +274,4 @@ class CachedMRMetadata(BaseModel):
     operation_type: str = Field(description="Type of operation (backport or rebase)")
     title: str = Field(description="Merge request title")
     package: str = Field(description="Package name")
-    details: str = Field(description="Operation-specific identifier (upstream_fix URL for backport, version for rebase)")
+    details: str = Field(description="Operation-specific identifier (list of upstream patch URLs for backport, version for rebase)")