This is an automated email from the ASF dual-hosted git repository.
zhengruifeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new d1a7c29232eb [MINOR][INFRA] Skip JIRA updates for minor, trivial, and
follow-up PRs
d1a7c29232eb is described below
commit d1a7c29232ebb5c57e8ad8276e5e4aad578b7a4c
Author: Ruifeng Zheng <[email protected]>
AuthorDate: Tue Aug 25 18:28:10 2026 +0800
[MINOR][INFRA] Skip JIRA updates for minor, trivial, and follow-up PRs
### What changes were proposed in this pull request?
This PR updates `dev/merge_spark_pr.py` so `update_jira_for_pr` returns
without prompting
for JIRA updates when the PR title is tagged `[MINOR]`, `[TRIVIAL]`, or
`[FOLLOWUP]`.
The merge paths now call `update_jira_for_pr` directly and let that
function own the skip
policy.
### Why are the changes needed?
Follow-up PRs can intentionally point at an already-resolved JIRA from the
original work.
The merge helper should not ask committers to perform JIRA update
operations for those
follow-up PRs, and the same local policy should also cover minor and
trivial PRs.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Not run; this is a small dev tooling change.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: OpenAI Codex (GPT-5)
Closes #58268 from zhengruifeng/dev-merge-followup-jira-dev-1.
Authored-by: Ruifeng Zheng <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
---
dev/merge_spark_pr.py | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 7a06d1c5dd33..39194b769021 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -1368,6 +1368,23 @@ def resolve_jira_issues(title, merge_branches, comment,
title_components=()):
def update_jira_for_pr(pr_num, title, merge_branches, title_components):
+ skip_jira_title_tags = ("MINOR", "TRIVIAL", "FOLLOWUP")
+ tags = set(title_components)
+ try:
+ parsed = Title.parse(title)
+ tags.update(parsed.leading)
+ tags.update(parsed.components)
+ except ValueError:
+ pass
+ skipped = [tag for tag in skip_jira_title_tags if tag in tags]
+ if skipped:
+ print()
+ print_error(
+ "Skipping JIRA operations for PR #%s because title has %s."
+ % (pr_num, ", ".join("[%s]" % tag for tag in skipped))
+ )
+ return
+
# asf_jira is guaranteed to be set here: initialize_jira() fails fast
otherwise.
print()
continue_maybe("Would you like to update an associated JIRA?")
@@ -1797,7 +1814,6 @@ def main():
# Normalized PR-title component tags, used later to reconcile JIRA
components. Empty for
# Revert/Reapply PRs, whose titles are kept verbatim and not parsed for
components.
title_components: List[str] = []
- is_minor = False
# Revert and Reapply PRs keep their title verbatim.
if not (is_revert_pr or is_reapply_pr):
@@ -1806,7 +1822,6 @@ def main():
parsed = Title.parse(title)
except ValueError as e:
fail("Malformed PR title: %s" % e)
- is_minor = "MINOR" in parsed.leading
# Normalize component tags via the registry and track primary.
components = []
@@ -1957,8 +1972,7 @@ def main():
post_merge_comment(pr_num, picked_commits)
# Backport mode may be the first chance to resolve a JIRA after an
interrupted
# original merge. If it was already resolved, add any newly
inferred fix versions.
- if not is_minor:
- update_jira_for_pr(pr_num, title, picked_refs,
title_components)
+ update_jira_for_pr(pr_num, title, picked_refs, title_components)
sys.exit(0)
if not bool(pr["mergeable"]):
@@ -2076,9 +2090,8 @@ def main():
# Record every branch that successfully received the change on the
PR.
post_merge_comment(pr_num, merged_commits)
# This is deliberately in the finally block: once the target branch
has been pushed,
- # cancelling a later cherry-pick must not bypass the mandatory JIRA
update.
- if not is_minor:
- update_jira_for_pr(pr_num, title, merged_refs, title_components)
+ # cancelling a later cherry-pick must not bypass the JIRA update
decision.
+ update_jira_for_pr(pr_num, title, merged_refs, title_components)
if __name__ == "__main__":
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
