Repository navigation
Add target::zstream label to MRs at creation time - #662
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces atomic labeling for GitLab merge requests at creation time to prevent webhook race conditions, specifically targeting the target::zstream label across various agents (backport, consolidation, rebase, and rebuild). Feedback on these changes highlights a critical bug in OpenMergeRequestTool._create_mr where the response_code and message are not propagated to GitlabAPIException, breaking the 409 Conflict handling for existing merge requests. Additionally, a minor improvement is suggested in mr_consolidation_agent.py to safely handle potentially None label values and avoid a TypeError.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
| try: | ||
| raw_mr = project.gitlab_repo.mergerequests.create(parameters) | ||
| except gitlab.GitlabError as ex: | ||
| raise GitlabAPIException() from ex |
There was a problem hiding this comment.
In _create_mr, when catching gitlab.GitlabError, a new GitlabAPIException is raised without passing the original exception's response_code or message.
This causes ex.response_code to be None when handled in _run (line 390), which prevents the 409 Conflict check (if ex.response_code == 409:) from succeeding. As a result, the tool will fail with an unhandled exception instead of gracefully reusing the existing merge request.
Please propagate the response_code and message from the caught GitlabError to the GitlabAPIException.
| try: | |
| raw_mr = project.gitlab_repo.mergerequests.create(parameters) | |
| except gitlab.GitlabError as ex: | |
| raise GitlabAPIException() from ex | |
| try: | |
| raw_mr = project.gitlab_repo.mergerequests.create(parameters) | |
| except gitlab.GitlabError as ex: | |
| raise GitlabAPIException(message=str(ex), response_code=ex.response_code) from ex |
There was a problem hiding this comment.
GitlabAPIException.response_code is a property that reads from self.cause, which is set by the from ex clause. The 409 should work correctly through the exception chain
Include the label atomically in the GitLab API create call to avoid a webhook race condition where CI picks up the MR before post-creation labels arrive. Uses python-gitlab directly instead of OGR for all MR creation (consistent code path regardless of labels). Fixes: https://redhat.atlassian.net/browse/PACKIT-5088 Assisted-by: Claude Opus 4.6
66fd14e to
49243ea
Compare
| available_tools=gateway_tools, | ||
| ) | ||
|
|
||
| source_labels = {label for mr in state.all_open_mrs for label in (mr.get("labels") or [])} |
There was a problem hiding this comment.
Only two oldest MRs are being consolidated, source_labels should come only from them.
|
|
||
| if state.merge_request_url: | ||
| try: | ||
| await run_tool( | ||
| "add_merge_request_labels", | ||
| merge_request_url=state.merge_request_url, | ||
| labels=["ymir_backport"], | ||
| available_tools=gateway_tools, | ||
| ) | ||
| except Exception as e: | ||
| logger.warning("Failed to label consolidated MR: %s", e) |
There was a problem hiding this comment.
From Claude:
The old post-creation add_merge_request_labels call is removed here, but open_merge_request doesn't update labels on the 409 (existing MR) path. The other agents are fine because tasks.commit_push_and_open_mr still has its own add_merge_request_labels fallback, but the consolidation agent calls open_merge_request directly.
Scope source labels to the two selected MRs (via state.mr_urls), add label fallback for 409-reused MRs, and fix is_new → is_new_mr key to match OpenMergeRequestResult. Assisted-by: Claude Opus 4.6
|
/gemini review |
|
Warning Gemini encountered an error creating the review. You can try again by commenting |
|
/gemini review |
|
Warning Gemini encountered an error creating the review. You can try again by commenting |
2 participants
Fixes: https://redhat.atlassian.net/browse/PACKIT-5088
Assisted-by: Claude Opus 4.6
TODO: