Repository: hbase Updated Branches: refs/heads/HBASE-18467 ea7baa560 -> d1f1c45ad
HBASE-18467 wait, I can just use the shell. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d1f1c45a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d1f1c45a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d1f1c45a Branch: refs/heads/HBASE-18467 Commit: d1f1c45ad70dddfe2a1c557e561fa2af236c8ae6 Parents: ea7baa5 Author: Sean Busbey <bus...@apache.org> Authored: Sun Aug 27 00:38:38 2017 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Sun Aug 27 00:38:38 2017 -0500 ---------------------------------------------------------------------- dev-support/Jenkinsfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d1f1c45a/dev-support/Jenkinsfile ---------------------------------------------------------------------- diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 27850a4..95d2b67 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -395,9 +395,6 @@ END echo "[INFO] There are ${currentBuild.changeSets.size()} change sets." def seenJiras = [] CharSequence pattern = /HBASE-[0-9]+/ - def foobar = { CharSequence foo, CharSequence bar -> - org.codehaus.groovy.runtime.StringGroovyMethods.find(foo,bar) - } for ( changelist in currentBuild.changeSets ) { if ( changelist.isEmptySet() ) { echo "[DEBUG] change set was empty, skipping JIRA comments." @@ -412,9 +409,14 @@ END echo " ${change.commitId}" echo " ${change.author}" echo "" - // For now, only match the first occurrance of an HBase jira id, due to JENKINS-46358 - currentIssue = foobar(msg, pattern) - if (currentIssue != null ) { + // Workaround for JENKINS-46358 + writeFile file: 'tmp_commit_file', text: msg + sh "grep -o -E '${pattern}' 'tmp_commit_file' >matched_jiras" + def jiras = readFile(file: 'matched_jiras').split() + if (jiras.length == 0) { + echo "[WARN] no JIRA key found in message, TODO email committer" + } + for (currentIssue in jiras) { echo "[DEBUG] found jira key: ${currentIssue}" if ( currentIssue in seenJiras ) { echo "[DEBUG] already commented on ${currentIssue}." @@ -423,8 +425,6 @@ END jiraComment issueKey: currentIssue, body: comment seenJiras << currentIssue } - } else { - echo "[WARN] no JIRA key found in message, TODO email committer" } } }