add some more information to junit xml reports

MachLearnPort · Feb 19, 2016 · 415ad90 · 415ad90
1 parent ca55089
commit 415ad90
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/h2o-algos/testMultiNode.sh b/h2o-algos/testMultiNode.sh
@@ -82,7 +82,7 @@ $JVM water.H2O -name $CLUSTER_NAME -baseport $CLUSTER_BASEPORT -ga_opt_out 1> $O
 
 # Launch last driver JVM.  All output redir'd at the OS level to sandbox files.
 echo Running h2o-algos junit tests...
-($JVM -Dai.h2o.name=$CLUSTER_NAME -Dai.h2o.baseport=$CLUSTER_BASEPORT -Dai.h2o.ga_opt_out=yes $JUNIT_RUNNER $JUNIT_TESTS_BOOT `cat $OUTDIR/tests.txt` 2>&1 ; echo $? > $OUTDIR/status.0) 1> $OUTDIR/out.0 2>&1
+($JVM -Dbuild.id=$BUILD_ID -Djob.name=$JOB_NAME -Dgit.commit=$GIT_COMMIT -Dgit.branch=$GIT_BRANCH -Dai.h2o.name=$CLUSTER_NAME -Dai.h2o.baseport=$CLUSTER_BASEPORT -Dai.h2o.ga_opt_out=yes $JUNIT_RUNNER $JUNIT_TESTS_BOOT `cat $OUTDIR/tests.txt` 2>&1 ; echo $? > $OUTDIR/status.0) 1> $OUTDIR/out.0 2>&1
 
 grep EXECUTION $OUTDIR/out.0 | cut "-d " -f22,19 | awk '{print $2 " " $1}'| sort -gr | head -n 10 >> $OUTDIR/out.0
 

diff --git a/h2o-core/src/test/java/water/junit/XMLTestReporter.java b/h2o-core/src/test/java/water/junit/XMLTestReporter.java
@@ -137,6 +137,8 @@ public void startTestSuite(String testSuiteName) throws Exception {
                                   StringEscapeUtils.escapeXml(dateFormat.format(new Date(testSuiteStartTime))));
     testSuiteElement.setAttribute("hostname",
                                   StringEscapeUtils.escapeXml(InetAddress.getLocalHost().getHostName()));
+    testSuiteElement.setAttribute("ncpu",
+      StringEscapeUtils.escapeXml(Integer.toString(Runtime.getRuntime().availableProcessors())));
 
     // system properties
     Element propertiesElement = document.createElement("properties");

diff --git a/h2o-core/testMultiNode.sh b/h2o-core/testMultiNode.sh
@@ -86,7 +86,7 @@ $JVM water.H2O -name $CLUSTER_NAME -baseport $CLUSTER_BASEPORT --ga_opt_out 1> $
 
 # Launch last driver JVM.  All output redir'd at the OS level to sandbox files.
 echo Running h2o-core junit tests...
-($JVM -Dai.h2o.name=$CLUSTER_NAME -Dai.h2o.baseport=$CLUSTER_BASEPORT -Dai.h2o.ga_opt_out=yes $JUNIT_RUNNER $JUNIT_TESTS_BOOT `cat $OUTDIR/tests.txt` 2>&1 ; echo $? > $OUTDIR/status.0) 1> $OUTDIR/out.0 2>&1
+($JVM -Dbuild.id=$BUILD_ID -Djob.name=$JOB_NAME -Dgit.commit=$GIT_COMMIT -Dgit.branch=$GIT_BRANCH -Dai.h2o.name=$CLUSTER_NAME -Dai.h2o.baseport=$CLUSTER_BASEPORT -Dai.h2o.ga_opt_out=yes $JUNIT_RUNNER $JUNIT_TESTS_BOOT `cat $OUTDIR/tests.txt` 2>&1 ; echo $? > $OUTDIR/status.0) 1> $OUTDIR/out.0 2>&1
 
 grep EXECUTION $OUTDIR/out.0 | cut "-d " -f22,19 | awk '{print $2 " " $1}'| sort -gr | head -n 10 >> $OUTDIR/out.0