Skip to content

[SPARK-57097][INFRA] Prevent merging Epic/Umbrella PRs in merge script #56137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhengruifeng wants to merge 6 commits into from
Closed

[SPARK-57097][INFRA] Prevent merging Epic/Umbrella PRs in merge script #56137

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d72a1f5
[MINOR][INFRA] Prevent merging Epic/Umbrella PRs in merge script
zhengruifeng May 27, 2026
d5cdf9c
Inline JIRA IDs as the subject of the failure message
zhengruifeng May 27, 2026
866a443
Surface the issue type in the failure message
zhengruifeng May 27, 2026
a4bdc07
Drop the plain ids_str and emphasize MUST
zhengruifeng May 27, 2026
0d47c02
Rename issuetype to issue_type and capitalize 'Umbrella or Epic'
zhengruifeng May 27, 2026
65e90cb
Fix black formatting on the failure message
zhengruifeng May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion dev/merge_spark_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,11 +1260,29 @@ def main():

if asf_jira is not None:
jira_ids = re.findall("SPARK-[0-9]{4,5}", title)
# Epic / Umbrella tickets group related work and must not be resolved by a single PR.
# Collect every offender so the committer sees the full list in one shot rather than
# discovering them one-by-one across repeated merge attempts.
blocking_issue_types = {"Epic", "Umbrella"}
blockers = []
for jira_id in jira_ids:
try:
print_jira_issue_summary(asf_jira.issue(jira_id))
issue = asf_jira.issue(jira_id)
except Exception:
print_error("Unable to fetch summary of %s" % jira_id)
continue
print_jira_issue_summary(issue)
issue_type = issue.fields.issuetype.name
if issue_type in blocking_issue_types:
blockers.append((jira_id, issue_type))
if blockers:
ids_str = ", ".join("%s (%s)" % (jid, t) for jid, t in blockers)
fail(
"Cannot merge PR #%s. Linked JIRA(s) %s are Umbrella or Epic "
"tickets and MUST not be resolved by a single PR. File "
"Sub-task(s) under %s and update the PR title to reference "
"the Sub-task(s) instead." % (pr_num, ids_str, ids_str)
)

print("\n=== Pull Request #%s ===" % pr_num)
print("title\t%s\nsource\t%s\ntarget\t%s\nurl\t%s" % (title, pr_repo_desc, target_ref, url))
Expand Down