Give make a long timeout, tests a small one, and interop a slightly longer one

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=300):
     """
     Arguments:
       cmdline: a list of arguments to pass as the command line

tools/run_tests/run_interops.py

@@ -19,7 +19,10 @@ jobs = []
 jobNumber = 0
 for lang in args.language:
   for test in _TESTS:
-    test_job = jobset.JobSpec(cmdline=['tools/run_tests/run_interops_test.sh', '%s' % lang, '%s' % test], shortname=test)
+    test_job = jobset.JobSpec(
+        cmdline=['tools/run_tests/run_interops_test.sh', '%s' % lang, '%s' % test],
+        shortname=test,
+        timeout_seconds=900)
     jobs.append(test_job)
     jobNumber+=1
 

tools/run_tests/run_tests.py

@@ -463,7 +463,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(