From 1b9e434b6c19f23a01e9875a3c1966cd03ce8e2d Mon Sep 17 00:00:00 2001
From: Patrick Wendell <patrick@databricks.com>
Date: Tue, 12 May 2015 18:20:54 -0700
Subject: [PATCH] [SPARK-7592] Always set resolution to "Fixed" in PR merge
script.
The issue is that the behavior of the ASF JIRA silently
changed. Now when the "Resolve Issue" transition occurs,
the default resolution is "Pending Closed". We used to
count on the default behavior being to set the
resolution as "Fixed".
The solution is to explicitly set the resolution as "Fixed" and not
count on default behavior.
Author: Patrick Wendell <patrick@databricks.com>
Closes #6103 from pwendell/merge-script-fix and squashes the following commits:
dcc16a6 [Patrick Wendell] Always set resolution to "Fixed" in PR merge script.
---
dev/merge_spark_pr.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index b69cd15f99..f952c9d0b1 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -265,8 +265,11 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
jira_fix_versions = map(lambda v: get_version_json(v), fix_versions)
resolve = filter(lambda a: a['name'] == "Resolve Issue", asf_jira.transitions(jira_id))[0]
+ resolution = filter(lambda r: r.raw['name'] == "Fixed", asf_jira.resolutions())[0]
+ custom_fields = {'resolution': {'id': resolution.raw['id']}}
asf_jira.transition_issue(
- jira_id, resolve["id"], fixVersions=jira_fix_versions, comment=comment)
+ jira_id, resolve["id"], fixVersions = jira_fix_versions,
+ comment = comment, fields = custom_fields)
print "Successfully resolved %s with fixVersions=%s!" % (jira_id, fix_versions)
--
GitLab