From 279526e49d6cb784bbd6880f68e8701d07cab458 Mon Sep 17 00:00:00 2001
From: Nicholas Chammas <nicholas.chammas@gmail.com>
Date: Fri, 15 Aug 2014 18:34:22 -0400
Subject: [PATCH 1/3] [SPARK-3076] catch & report test timeouts

* Remove unused code to get jq
* Set timeout on tests and report gracefully on them
---
 dev/run-tests-jenkins | 46 +++++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins
index 721f09be5be6d..7ce9cee47a8b4 100755
--- a/dev/run-tests-jenkins
+++ b/dev/run-tests-jenkins
@@ -26,27 +26,15 @@
 FWDIR="$(cd `dirname $0`/..; pwd)"
 cd "$FWDIR"
 
-function get_jq () {
-  # Get jq so we can parse some JSON, man.
-  # Essential if we want to do anything with the GitHub API responses.
-  local JQ_EXECUTABLE_URL="http://stedolan.github.io/jq/download/linux64/jq"
-
-  echo "Fetching jq from ${JQ_EXECUTABLE_URL}"
-  
-  curl --silent --output "$FWDIR/dev/jq" "$JQ_EXECUTABLE_URL"
-  local curl_status=$?
-
-  if [ $curl_status -ne 0 ]; then
-      echo "Failed to get jq." >&2
-      return $curl_status
-  fi
-
-  chmod u+x "$FWDIR/dev/jq"
-}
-
 COMMENTS_URL="https://api.github.com/repos/apache/spark/issues/$ghprbPullId/comments"
 PULL_REQUEST_URL="https://github.com/apache/spark/pull/$ghprbPullId"
 
+COMMIT_URL="https://github.com/apache/spark/commit/${ghprbActualCommit}"
+# GitHub doesn't auto-link short hashes when submitted via the API, unfortunately. :(
+SHORT_COMMIT_HASH="${ghprbActualCommit:0:7}"
+
+TESTS_TIMEOUT="1m" # experimental
+
 function post_message () {
   local message=$1
   local data="{\"body\": \"$message\"}"
@@ -96,10 +84,6 @@ function post_message () {
   fi
 }
 
-COMMIT_URL="https://github.com/apache/spark/commit/${ghprbActualCommit}"
-# GitHub doesn't auto-link short hashes when submitted via the API, unfortunately. :(
-short_commit_hash=${ghprbActualCommit:0:7}
-
 # check PR merge-ability and check for new public classes
 {
   if [ "$sha1" == "$ghprbActualCommit" ]; then
@@ -138,7 +122,7 @@ short_commit_hash=${ghprbActualCommit:0:7}
 {
   start_message="\
   [QA tests have started](${BUILD_URL}consoleFull) for \
-  PR $ghprbPullId at commit [\`${short_commit_hash}\`](${COMMIT_URL})."
+  PR $ghprbPullId at commit [\`${SHORT_COMMIT_HASH}\`](${COMMIT_URL})."
   
   start_message="${start_message}\n${merge_note}"
   # start_message="${start_message}\n${public_classes_note}"
@@ -148,13 +132,19 @@ short_commit_hash=${ghprbActualCommit:0:7}
 
 # run tests
 {
-  ./dev/run-tests
+  timeout "${TESTS_TIMEOUT}" ./dev/run-tests
   test_result="$?"
 
-  if [ "$test_result" -eq "0" ]; then
-    test_result_note=" * This patch **passes** unit tests."
+  if [ "$test_result" -eq "124" ]; then
+    fail_message="**Tests timed out** after a configured wait of `${TESTS_TIMEOUT}`."
+    post_message "$fail_message"
+    exit $test_result
   else
-    test_result_note=" * This patch **fails** unit tests."
+    if [ "$test_result" -eq "0" ]; then
+      test_result_note=" * This patch **passes** unit tests."
+    else
+      test_result_note=" * This patch **fails** unit tests."
+    fi
   fi
 }
 
@@ -162,7 +152,7 @@ short_commit_hash=${ghprbActualCommit:0:7}
 {
   result_message="\
   [QA tests have finished](${BUILD_URL}consoleFull) for \
-  PR $ghprbPullId at commit [\`${short_commit_hash}\`](${COMMIT_URL})."
+  PR $ghprbPullId at commit [\`${SHORT_COMMIT_HASH}\`](${COMMIT_URL})."
 
   result_message="${result_message}\n${test_result_note}"
   result_message="${result_message}\n${merge_note}"

From 8b1ea41236c4bf33344f6e6d4b3387458a8feef5 Mon Sep 17 00:00:00 2001
From: Nicholas Chammas <nicholas.chammas@gmail.com>
Date: Fri, 15 Aug 2014 18:42:45 -0400
Subject: [PATCH 2/3] fix formatting

---
 dev/run-tests-jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins
index 7ce9cee47a8b4..2fb7c8b5efc28 100755
--- a/dev/run-tests-jenkins
+++ b/dev/run-tests-jenkins
@@ -136,7 +136,7 @@ function post_message () {
   test_result="$?"
 
   if [ "$test_result" -eq "124" ]; then
-    fail_message="**Tests timed out** after a configured wait of `${TESTS_TIMEOUT}`."
+    fail_message="**Tests timed out** after a configured wait of \`${TESTS_TIMEOUT}\`."
     post_message "$fail_message"
     exit $test_result
   else

From d1f1b6bda0dd3679abd61a2b380119528388eb0e Mon Sep 17 00:00:00 2001
From: Nicholas Chammas <nicholas.chammas@gmail.com>
Date: Fri, 15 Aug 2014 18:46:29 -0400
Subject: [PATCH 3/3] set timeout to realistic number

---
 dev/run-tests-jenkins | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins
index 2fb7c8b5efc28..dfb9ed04fe76b 100755
--- a/dev/run-tests-jenkins
+++ b/dev/run-tests-jenkins
@@ -33,7 +33,9 @@ COMMIT_URL="https://github.com/apache/spark/commit/${ghprbActualCommit}"
 # GitHub doesn't auto-link short hashes when submitted via the API, unfortunately. :(
 SHORT_COMMIT_HASH="${ghprbActualCommit:0:7}"
 
-TESTS_TIMEOUT="1m" # experimental
+# NOTE: Jenkins will kill the whole build after 120 minutes.
+#       Tests are a large part of that, but not all of it.
+TESTS_TIMEOUT="100m"
 
 function post_message () {
   local message=$1