diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index aa3f4bfb4198fd751c0241e9b1f80819c3b3b9bb..538deac0e3eedab58d0c05a9688db85e6d36f5e3 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -131,7 +131,7 @@ class JobSpec(object): """Specifies what to run for a job.""" def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, - cwd=None, shell=False, timeout_seconds=900): + cwd=None, shell=False, timeout_seconds=5*60): """ Arguments: cmdline: a list of arguments to pass as the command line diff --git a/tools/run_tests/run_interops.py b/tools/run_tests/run_interops.py index 4e6b5ce2f68176cfb197463a71c488ecb7d55dc2..e1d40d32c1c84a2c349d8cf86ebaeaf9c78ac3be 100755 --- a/tools/run_tests/run_interops.py +++ b/tools/run_tests/run_interops.py @@ -15,7 +15,10 @@ _TESTS = ['large_unary', 'empty_unary', 'ping_pong', 'client_streaming', 'server jobs = [] jobNumber = 0 for test in _TESTS: - test_job = jobset.JobSpec(cmdline=['tools/run_tests/run_interops_test.sh', '%s' % args.language, '%s' % test], shortname=test) + test_job = jobset.JobSpec( + cmdline=['tools/run_tests/run_interops_test.sh', '%s' % args.language, '%s' % test], + shortname=test, + timeout_seconds=15*60) jobs.append(test_job) jobNumber+=1 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 47d2b6183e1389d7342af863a5c9779a0ad920a8..1a6752c7845e2adac053b455303de6d6a7591988 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -470,7 +470,8 @@ else: '-j', '%d' % (multiprocessing.cpu_count() + 1), 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % args.slowdown, - 'CONFIG=%s' % cfg] + targets) + 'CONFIG=%s' % cfg] + targets, + timeout_seconds=30*60) build_steps = [make_jobspec(cfg, list(set(itertools.chain.from_iterable(