Repository: zookeeper Updated Branches: refs/heads/master 440e0923d -> 881256ea9
ZOOKEEPER-2631: Make issue extraction in the git pull request script more robust (Flavio P. Junqueira via rgs) Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/881256ea Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/881256ea Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/881256ea Branch: refs/heads/master Commit: 881256ea97a19e51b1c6e9a114e6e61ad83bd4ec Parents: 440e092 Author: Raul Gutierrez Segales <[email protected]> Authored: Sat Nov 12 19:53:43 2016 -0800 Committer: Raul Gutierrez Segales <[email protected]> Committed: Sat Nov 12 19:53:43 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/test/bin/test-github-pr.sh | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/881256ea/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7849a67..01ed27b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -541,6 +541,9 @@ IMPROVEMENTS: ZOOKEEPER-2594: Use TLS for downloading artifacts during build (Olaf Flebbe via phunt) + ZOOKEEPER-2631: Make issue extraction in the git pull request script + more robust (Flavio P. Junqueira via rgs) + Release 3.5.0 - 8/4/2014 NEW FEATURES: http://git-wip-us.apache.org/repos/asf/zookeeper/blob/881256ea/src/java/test/bin/test-github-pr.sh ---------------------------------------------------------------------- diff --git a/src/java/test/bin/test-github-pr.sh b/src/java/test/bin/test-github-pr.sh index c026e8b..e155769 100755 --- a/src/java/test/bin/test-github-pr.sh +++ b/src/java/test/bin/test-github-pr.sh @@ -51,11 +51,15 @@ parseArgs() { PULLREQUEST_TITLE="${GIT_PR_TITLE}" ## Extract jira number from PR title - defect=${PULLREQUEST_TITLE%%:*} + local prefix=${PULLREQUEST_TITLE%ZOOKEEPER\-[0-9]*} + local noprefix=${PULLREQUEST_TITLE#$prefix} + local regex='\(ZOOKEEPER-.[0-9]*\)' + defect=$(expr "$noprefix" : ${regex}) echo "Pull request id: ${PULLREQUEST_ID}" echo "Pull request title: ${PULLREQUEST_TITLE}" echo "Defect number: ${defect}" + JIRA_COMMENT="GitHub Pull Request ${PULLREQUEST_NUMBER} Build " ;; @@ -156,8 +160,8 @@ setup () { cleanupAndExit 1 fi ### get pull request diff - curl -L ${GIT_PR_URL}.diff > $PATCH_DIR/patch - + ${CURL} -L ${GIT_PR_URL}.diff > $PATCH_DIR/patch + echo "" echo "" echo "======================================================================" @@ -576,14 +580,14 @@ if [[ $QABUILD == "true" ]] ; then exit 100 fi fi -echo "----- Checked out, going to set up -----" setup checkAuthor -RESULT=$? +(( RESULT = RESULT + $? )) checkTests -(( RESULT = RESULT + $? )) -if [[ $? != 0 ]] ; then +checkTestsResult=$? +(( RESULT = RESULT + $checkTestsResult )) +if [[ $checkTestsResult != 0 ]] ; then submitJiraComment 1 cleanupAndExit 1 fi
