Repository: incubator-ignite Updated Branches: refs/heads/ignite-456 4f637d0a0 -> 28cfe8089
# ignite-456: runAllBuilds with null JiraNum Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28cfe808 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28cfe808 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28cfe808 Branch: refs/heads/ignite-456 Commit: 28cfe80895260e2708107772290860b79e014966 Parents: 4f637d0 Author: null <null> Authored: Wed May 20 16:39:38 2015 +0300 Committer: null <null> Committed: Wed May 20 16:39:38 2015 +0300 ---------------------------------------------------------------------- dev-tools/src/main/groovy/jiraslurp.groovy | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28cfe808/dev-tools/src/main/groovy/jiraslurp.groovy ---------------------------------------------------------------------- diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy b/dev-tools/src/main/groovy/jiraslurp.groovy index 655f464..e9f9820 100644 --- a/dev-tools/src/main/groovy/jiraslurp.groovy +++ b/dev-tools/src/main/groovy/jiraslurp.groovy @@ -194,13 +194,21 @@ def runAllTestBuilds = { builds, jiraNum -> try { println "Triggering $it build for $jiraNum jira..." - String postData = - "<build>" + - " <buildType id='$it'/>" + - " <properties>" + - " <property name='env.JIRA_NUM' value='$jiraNum'/>" + - " </properties>" + - "</build>"; + String postData + + if (jiraNum != 'null' || jiraNum != null) { + postData = "<build>" + + " <buildType id='$it'/>" + + "</build>"; + } + else { + postData = "<build>" + + " <buildType id='$it'/>" + + " <properties>" + + " <property name='env.JIRA_NUM' value='$jiraNum'/>" + + " </properties>" + + "</build>"; + } URL url = new URL("http://$tcURL:80/httpAuth/app/rest/buildQueue";); @@ -285,7 +293,7 @@ args.each { applyPatch(jira, attachementURL) } } - else if (parameters.length >= 2 && parameters[0] == "runAllBuilds" && parameters[1] ==~ /\w+-\d+/) { + else if (parameters.length >= 2 && parameters[0] == "runAllBuilds") { def jiraNum = parameters[1] def attachementURL=null
