yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [1/2] yetus git commit: YETUS-128. Jira plugin should be configurable to accept issue status other than 'Patch Available'
Date Mon, 26 Oct 2015 22:50:40 GMT
Repository: yetus
Updated Branches:
  refs/heads/master 4ffe709de -> 1d78a3fe8


YETUS-128. Jira plugin should be configurable to accept issue status other than 'Patch Available'

Signed-off-by: Allen Wittenauer <aw@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/10cec8b2
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/10cec8b2
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/10cec8b2

Branch: refs/heads/master
Commit: 10cec8b2cbb75ae7de620cbbd34f8cd5b2d8cb7c
Parents: 4ffe709
Author: Kengo Seki <sekikn@gmail.com>
Authored: Mon Oct 26 08:00:25 2015 +0900
Committer: Allen Wittenauer <aw@apache.org>
Committed: Mon Oct 26 15:48:09 2015 -0700

----------------------------------------------------------------------
 dev-support/test-patch.d/jira.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/10cec8b2/dev-support/test-patch.d/jira.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.d/jira.sh b/dev-support/test-patch.d/jira.sh
index 1c554f1..e5fd550 100755
--- a/dev-support/test-patch.d/jira.sh
+++ b/dev-support/test-patch.d/jira.sh
@@ -23,14 +23,18 @@ JIRA_URL=${JIRA_URL:-"https://issues.apache.org/jira"}
 # Issue regex to help identify the project
 JIRA_ISSUE_RE=''
 
+# If the issue status is matched with this pattern, the attached patch is regarded as ready
to be applied
+JIRA_STATUS_RE='Patch Available'
+
 add_bugsystem jira
 
 function jira_usage
 {
   echo "JIRA Options:"
+  echo "--jira-base-url=<url>   The URL of the JIRA server (default:'${JIRA_URL}')"
   echo "--jira-issue-re=<expr>  Bash regular expression to use when trying to find
a jira ref in the patch name (default: \'${JIRA_ISSUE_RE}\')"
   echo "--jira-password=<pw>    The password for the 'jira' command"
-  echo "--jira-base-url=<url>   The URL of the JIRA server (default:'${JIRA_URL}')"
+  echo "--jira-status-re=<expr> Grep regular expression representing the issue status
whose patch is applicable to the codebase (default: \'${JIRA_STATUS_RE}\')"
   echo "--jira-user=<user>      The user for the 'jira' command"
 }
 
@@ -49,6 +53,9 @@ function jira_parse_args
       --jira-password=*)
         JIRA_PASSWD=${i#*=}
       ;;
+      --jira-status-re=*)
+        JIRA_STATUS_RE=${i#*=}
+      ;;
       --jira-user=*)
         JIRA_USER=${i#*=}
       ;;
@@ -132,12 +139,12 @@ function jira_locate_patch
     echo "${input} appears to be a Github PR. Switching Modes."
     github_jira_bridge "${fileloc}"
     return $?
-  elif [[ $(${GREP} -c 'Patch Available' "${PATCH_DIR}/jira") == 0 ]]; then
+  elif [[ $(${GREP} -c "${JIRA_STATUS_RE}" "${PATCH_DIR}/jira") == 0 ]]; then
     if [[ ${JENKINS} == true ]]; then
-      yetus_error "ERROR: ${input} is not \"Patch Available\"."
+      yetus_error "ERROR: ${input} issue status is not matched with \"${JIRA_STATUS_RE}\"."
       cleanup_and_exit 1
     else
-      yetus_error "WARNING: ${input} is not \"Patch Available\"."
+      yetus_error "WARNING: ${input} issue status is not matched with \"${JIRA_STATUS_RE}\"."
     fi
   fi
 


Mime
View raw message