|
|
|
@ -344,6 +344,11 @@ def add_auth_options(language, test_case, cmdline, env): |
|
|
|
|
def _job_kill_handler(job): |
|
|
|
|
if job._spec.container_name: |
|
|
|
|
dockerjob.docker_kill(job._spec.container_name) |
|
|
|
|
# When the job times out and we decide to kill it, |
|
|
|
|
# we need to wait a before restarting the job |
|
|
|
|
# to prevent "container name already in use" error. |
|
|
|
|
# TODO(jtattermusch): figure out a cleaner way to to this. |
|
|
|
|
time.sleep(2) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def cloud_to_prod_jobspec(language, test_case, docker_image=None, auth=False): |
|
|
|
@ -378,7 +383,7 @@ def cloud_to_prod_jobspec(language, test_case, docker_image=None, auth=False): |
|
|
|
|
cwd=cwd, |
|
|
|
|
environ=environ, |
|
|
|
|
shortname='%s:%s:%s' % (suite_name, language, test_case), |
|
|
|
|
timeout_seconds=2*60, |
|
|
|
|
timeout_seconds=90, |
|
|
|
|
flake_retries=5 if args.allow_flakes else 0, |
|
|
|
|
timeout_retries=2 if args.allow_flakes else 0, |
|
|
|
|
kill_handler=_job_kill_handler) |
|
|
|
@ -414,7 +419,7 @@ def cloud_to_cloud_jobspec(language, test_case, server_name, server_host, |
|
|
|
|
environ=environ, |
|
|
|
|
shortname='cloud_to_cloud:%s:%s_server:%s' % (language, server_name, |
|
|
|
|
test_case), |
|
|
|
|
timeout_seconds=2*60, |
|
|
|
|
timeout_seconds=90, |
|
|
|
|
flake_retries=5 if args.allow_flakes else 0, |
|
|
|
|
timeout_retries=2 if args.allow_flakes else 0, |
|
|
|
|
kill_handler=_job_kill_handler) |
|
|
|
|