[hadoop-submarine] branch master updated: SUBMARINE-195. Fix the incorrect project name in merge_submarine_pr.py

[zt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ztang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b8e588  SUBMARINE-195. Fix the incorrect project name in merge_submarine_pr.py
4b8e588 is described below

commit 4b8e588e651c8ddc382d43a762998bfcc5e53687
Author: Zhankun Tang <zt...@apache.org>
AuthorDate: Mon Sep 23 15:22:07 2019 +0800

    SUBMARINE-195. Fix the incorrect project name in merge_submarine_pr.py
    
    ### What is this PR for?
    When it merges the PR and the committer chose to close Jira, it fails with something like project "HADOOP-SUBMARINE" not be found. Tested that change it to "SUBMARINE" will work.
    
    ### What type of PR is it?
    Bug Fix
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/SUBMARINE-195
    
    ### How should this be tested?
    use the cicd image to do the PR merge. And also choose yes to update the associated JIRA.
    It will work with this fix.
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Zhankun Tang <zt...@apache.org>
    
    Closes #7 from tangzhankun/submarine-195 and squashes the following commits:
    
    ca52b46 [Zhankun Tang] SUBMARINE-195. Fix the incorrect project name in merge_submarine_pr.py
---
 dev-support/cicd/merge_submarine_pr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-support/cicd/merge_submarine_pr.py b/dev-support/cicd/merge_submarine_pr.py
index cac8363..486dda8 100755
--- a/dev-support/cicd/merge_submarine_pr.py
+++ b/dev-support/cicd/merge_submarine_pr.py
@@ -243,7 +243,7 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
     print ("summary\t\t%s\nassignee\t%s\nstatus\t\t%s\nurl\t\t%s/%s\n" % (
         cur_summary, cur_assignee, cur_status, JIRA_BASE, jira_id))
 
-    versions = asf_jira.project_versions("HADOOP-SUBMARINE")
+    versions = asf_jira.project_versions("SUBMARINE")
     versions = sorted(versions, key=lambda x: x.name, reverse=True)
     versions = filter(lambda x: x.raw['released'] is False, versions)
     # Consider only x.y.z versions
@@ -353,4 +353,4 @@ if JIRA_IMPORTED:
         print "Exiting without trying to close the associated JIRA."
 else:
     print "Could not find jira library. Run 'sudo pip install jira' to install."
-    print "Exiting without trying to close the associated JIRA."
\ No newline at end of file
+    print "Exiting without trying to close the associated JIRA."