Merge #153958

153958: teamcity: update extra stress per-test timeout r=miraradeva a=stevendanna

I was originally confused about the meaning of this flag resulting in a hung test run not timing out for hours.

Informs #152701
Release note: None

Co-authored-by: Steven Danna <[email protected]>

Author: craig[bot]

build/teamcity/cockroach/nightlies/cockroach_nightly_extra_stress_impl.sh

@@ -46,7 +46,7 @@ done
 test_filter="${test_filter})\$"
 
 export RUNS_PER_TEST=1000
-export TEST_ARGS="--test_timeout=25200 --runs_per_test $RUNS_PER_TEST"
+export TEST_ARGS="--test_timeout=300 --runs_per_test $RUNS_PER_TEST"
 
 mkdir -p $ARTIFACTS_DIR
 
@@ -62,7 +62,7 @@ $BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci -- test //pkg/kv/kvserver/asim/tests:tests
                                       --test_env TC_SERVER_URL \
                                       --test_env COCKROACH_RUN_ASIM_TESTS=true \
                                       --test_filter="^TestDataDriven$" \
-                                      --test_timeout=3600 \
+                                      --test_timeout=600 \
     || exit_status=$?
 
 # Run the rest of the tests under stress.