[CI-shell-tests] Support granular test timeout (bazel-contrib#1125)

* Testing short test timeout

* Now using realistic timeout

Author: or-shachar

test/shell/test_runner.sh

@@ -5,7 +5,6 @@
 NC='\033[0m'
 GREEN='\033[0;32m'
 RED='\033[0;31m'
-TIMOUT=60
 
 run_test_ci() {
   # spawns the test to new process
@@ -15,6 +14,7 @@ run_test_ci() {
   eval $TEST_ARG &>$log_file &
   local test_pid=$!
   SECONDS=0
+  TIMOUT=${TEST_TIMEOUT-60}
   test_pulse_printer $! $TIMOUT $TEST_ARG &
   local pulse_printer_pid=$!
   local result

test_version.sh

@@ -120,8 +120,9 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 . "${dir}"/test/shell/test_runner.sh
 runner=$(get_test_runner "${1:-local}")
 export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat $dir/.bazelversion)}
-$runner test_scala_version "${scala_2_11_version}"
-$runner test_scala_version "${scala_2_12_version}"
 
-$runner test_twitter_scrooge_versions "18.6.0"
-$runner test_twitter_scrooge_versions "20.5.0"
+TEST_TIMEOUT=15 $runner test_scala_version "${scala_2_11_version}"
+TEST_TIMEOUT=15 $runner test_scala_version "${scala_2_12_version}"
+
+TEST_TIMEOUT=15 $runner test_twitter_scrooge_versions "18.6.0"
+TEST_TIMEOUT=15 $runner test_twitter_scrooge_versions "20.5.0"