|
|
|
@ -52,14 +52,14 @@ def _safe_report_name(name): |
|
|
|
|
def _report_filename(name): |
|
|
|
|
"""Generates report file name with directory structure that leads to better presentation by internal CI""" |
|
|
|
|
# 'sponge_log.xml' suffix must be there for results to get recognized by kokoro. |
|
|
|
|
return 'run_tests_%s/%s' % (_safe_report_name(name), 'sponge_log.xml') |
|
|
|
|
return '%s/%s' % (_safe_report_name(name), 'sponge_log.xml') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _report_logfilename(name): |
|
|
|
|
"""Generates log file name that corresponds to name generated by _report_filename""" |
|
|
|
|
# 'sponge_log.log' suffix must be there for log to get recognized as "target log" |
|
|
|
|
# for the corresponding 'sponge_log.xml' report. |
|
|
|
|
return 'run_tests_%s/%s' % (_safe_report_name(name), 'sponge_log.log') |
|
|
|
|
return '%s/%s' % (_safe_report_name(name), 'sponge_log.log') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _docker_jobspec(name, |
|
|
|
@ -75,7 +75,7 @@ def _docker_jobspec(name, |
|
|
|
|
'python', 'tools/run_tests/run_tests.py', '--use_docker', '-t', |
|
|
|
|
'-j', |
|
|
|
|
str(inner_jobs), '-x', |
|
|
|
|
_report_filename(name), '--report_suite_name', |
|
|
|
|
'run_tests/%s' % _report_filename(name), '--report_suite_name', |
|
|
|
|
'%s' % _safe_report_name(name) |
|
|
|
|
] + runtests_args, |
|
|
|
|
environ=runtests_envs, |
|
|
|
@ -103,7 +103,7 @@ def _workspace_jobspec(name, |
|
|
|
|
'bash', 'tools/run_tests/helper_scripts/run_tests_in_workspace.sh', |
|
|
|
|
'-t', '-j', |
|
|
|
|
str(inner_jobs), '-x', |
|
|
|
|
'../%s' % _report_filename(name), '--report_suite_name', |
|
|
|
|
'../run_tests/%s' % _report_filename(name), '--report_suite_name', |
|
|
|
|
'%s' % _safe_report_name(name) |
|
|
|
|
] + runtests_args, |
|
|
|
|
environ=env, |
|
|
|
|