Skip to content
Snippets Groups Projects
Commit 0c3b4c80 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #2799 from ctiller/selective-town

Give make a long timeout, tests a small one, and interop a slightly longer one
parents 0b15b44f 2cd4e87f
No related branches found
No related tags found
No related merge requests found
...@@ -131,7 +131,7 @@ class JobSpec(object): ...@@ -131,7 +131,7 @@ class JobSpec(object):
"""Specifies what to run for a job.""" """Specifies what to run for a job."""
def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, 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: Arguments:
cmdline: a list of arguments to pass as the command line cmdline: a list of arguments to pass as the command line
......
...@@ -15,7 +15,10 @@ _TESTS = ['large_unary', 'empty_unary', 'ping_pong', 'client_streaming', 'server ...@@ -15,7 +15,10 @@ _TESTS = ['large_unary', 'empty_unary', 'ping_pong', 'client_streaming', 'server
jobs = [] jobs = []
jobNumber = 0 jobNumber = 0
for test in _TESTS: 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) jobs.append(test_job)
jobNumber+=1 jobNumber+=1
......
...@@ -470,7 +470,8 @@ else: ...@@ -470,7 +470,8 @@ else:
'-j', '%d' % (multiprocessing.cpu_count() + 1), '-j', '%d' % (multiprocessing.cpu_count() + 1),
'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' %
args.slowdown, args.slowdown,
'CONFIG=%s' % cfg] + targets) 'CONFIG=%s' % cfg] + targets,
timeout_seconds=30*60)
build_steps = [make_jobspec(cfg, build_steps = [make_jobspec(cfg,
list(set(itertools.chain.from_iterable( list(set(itertools.chain.from_iterable(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment