You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/20 15:50:36 UTC
[1/2] incubator-ignite git commit: # ignite-456: runAllBuilds fix
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-456 28cfe8089 -> 1f22ab13f
# ignite-456: runAllBuilds fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/57805914
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57805914
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57805914
Branch: refs/heads/ignite-456
Commit: 57805914fb1d43f0128767b05ffe50d49eb0416d
Parents: 28cfe80
Author: null <null>
Authored: Wed May 20 16:43:15 2015 +0300
Committer: null <null>
Committed: Wed May 20 16:43:15 2015 +0300
----------------------------------------------------------------------
dev-tools/src/main/groovy/jiraslurp.groovy | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57805914/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 e9f9820..4db6099 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -293,17 +293,14 @@ args.each {
applyPatch(jira, attachementURL)
}
}
- else if (parameters.length >= 2 && parameters[0] == "runAllBuilds") {
- def jiraNum = parameters[1]
-
- def attachementURL=null
+ else if (parameters.length >= 2 && parameters[0] == "runAllBuilds" && parameters[1] != 'null') {
+ def builds = parameters[1].split(' ');
- if (parameters[2] ==~ /\d+/)
- attachementURL = parameters[2]
+ def jiraNum = parameters[2]
- println "Running in 'all builds' mode with jira number='$jiraNum' and attachment URL='$attachementURL'."
+ println "Running in 'all builds' mode for builds=$builds with jira number='$jiraNum'."
- runAllTestBuilds jiraNum attachmentURL
+ runAllTestBuilds(builds, jiraNum)
}
}
[2/2] incubator-ignite git commit: # ignite-456: runAllBuilds fix
Posted by sb...@apache.org.
# ignite-456: runAllBuilds fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1f22ab13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f22ab13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f22ab13
Branch: refs/heads/ignite-456
Commit: 1f22ab13fc15337af9ea4b1b3d6ca7284133faaf
Parents: 5780591
Author: null <null>
Authored: Wed May 20 16:51:33 2015 +0300
Committer: null <null>
Committed: Wed May 20 16:51:33 2015 +0300
----------------------------------------------------------------------
dev-tools/build.gradle | 2 +-
dev-tools/src/main/groovy/jiraslurp.groovy | 91 ++++++++++++-------------
2 files changed, 45 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f22ab13/dev-tools/build.gradle
----------------------------------------------------------------------
diff --git a/dev-tools/build.gradle b/dev-tools/build.gradle
index 164a775..02dfea6 100644
--- a/dev-tools/build.gradle
+++ b/dev-tools/build.gradle
@@ -48,7 +48,7 @@ task patchapply(dependsOn: 'classes', type: JavaExec) {
}
task runAllBuilds(dependsOn: 'classes', type: JavaExec) {
- args("runAllBuilds,${System.getenv('JIRA_NUM')}")
+ args("runAllBuilds,${System.getenv('TEST_BUILDS')},${System.getenv('JIRA_NUM')}")
main = 'jiraslurp'
classpath = sourceSets.main.runtimeClasspath
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f22ab13/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 4db6099..5089a27 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -182,68 +182,65 @@ def JIRA_xml = { jiranum ->
* Runs all given test builds to validate last patch from given jira.
*/
def runAllTestBuilds = { builds, jiraNum ->
- assert jiraNum != 'null', 'Jira number should not be null.'
- assert jiraNum != null, 'Jira number should not be null.'
+ def tcURL = System.getenv('TC_URL')
+ def user = System.getenv('TASK_RUNNER_USER')
+ def pwd = System.getenv('TASK_RUNNER_PWD')
- if (jiraNum) {
- def tcURL = System.getenv('TC_URL')
- def user = System.getenv('TASK_RUNNER_USER')
- def pwd = System.getenv('TASK_RUNNER_PWD')
+ builds.each {
+ try {
+ println "Triggering $it build for $jiraNum jira..."
- builds.each {
- try {
- println "Triggering $it build for $jiraNum jira..."
+ String postData
- 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>";
+ }
- 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>";
- }
+ println "Request: $postData"
- URL url = new URL("http://$tcURL:80/httpAuth/app/rest/buildQueue");
+ URL url = new URL("http://$tcURL:80/httpAuth/app/rest/buildQueue");
- HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+ HttpURLConnection conn = (HttpURLConnection)url.openConnection();
- String encoded = new sun.misc.BASE64Encoder().encode("$user:$pwd".getBytes());
+ String encoded = new sun.misc.BASE64Encoder().encode("$user:$pwd".getBytes());
- conn.setRequestProperty("Authorization", "Basic " + encoded);
+ conn.setRequestProperty("Authorization", "Basic " + encoded);
- conn.setDoOutput(true);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "application/xml");
- conn.setRequestProperty("Content-Length", String.valueOf(postData.length()));
+ conn.setDoOutput(true);
+ conn.setRequestMethod("POST");
+ conn.setRequestProperty("Content-Type", "application/xml");
+ conn.setRequestProperty("Content-Length", String.valueOf(postData.length()));
- OutputStream os = conn.getOutputStream();
- os.write(postData.getBytes());
- os.flush();
- os.close();
+ OutputStream os = conn.getOutputStream();
+ os.write(postData.getBytes());
+ os.flush();
+ os.close();
- conn.connect();
+ conn.connect();
- // Read response.
- print "Response: "
+ // Read response.
+ print "Response: "
- BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
- String line;
- while ((line = br.readLine()) != null)
- println line
+ String line;
+ while ((line = br.readLine()) != null)
+ println line
- br.close();
- }
- catch (Exception e) {
- e.printStackTrace()
- }
+ br.close();
+ }
+ catch (Exception e) {
+ e.printStackTrace()
}
}
}