Repository: incubator-griffin Updated Branches: refs/heads/master 3a4e35e57 -> 15a52057a
GitHub sync jira Automatically close jira ticket when merged. Author: William Guo <[email protected]> Closes #7 from guoyuepeng/github_sync_jira. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/15a52057 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/15a52057 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/15a52057 Branch: refs/heads/master Commit: 15a52057a2c2a1bbd4b1f82fc93de25dca07f1be Parents: 3a4e35e Author: William Guo <[email protected]> Authored: Fri Mar 17 15:10:05 2017 -0700 Committer: William Guo <[email protected]> Committed: Fri Mar 17 15:10:05 2017 -0700 ---------------------------------------------------------------------- merge_pr.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/15a52057/merge_pr.py ---------------------------------------------------------------------- diff --git a/merge_pr.py b/merge_pr.py index 53d00cf..170726b 100755 --- a/merge_pr.py +++ b/merge_pr.py @@ -229,16 +229,16 @@ def fix_version_from_branch(branch, versions): return filter(lambda x: x.name.startswith(branch_ver), versions)[-1] -def resolve_jira_issue(merge_branches, comment, default_jira_id=""): +def resolve_jira_issue(merge_branches, comment, default_jira_id="5"): asf_jira = jira.client.JIRA({'server': JIRA_API_BASE}, basic_auth=(JIRA_USERNAME, JIRA_PASSWORD)) - jira_id = raw_input("Enter a JIRA id [%s]: " % default_jira_id) + jira_id = raw_input("Enter a Griffin JIRA number id [%s]: " % default_jira_id) if jira_id == "": jira_id = default_jira_id try: - issue = asf_jira.issue(jira_id) + issue = asf_jira.issue("GRIFFIN-%s" % (jira_id)) except Exception as e: fail("ASF JIRA could not find %s\n%s" % (jira_id, e))
