diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-03-08 14:26:37 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-08 14:26:37 +0100 |
| commit | d1287b580e9a4dff160d61bb5766c2fd95fe4c79 (patch) | |
| tree | 8bd2cd7a32188adfae4dac84bbfacf96289799a4 /tools | |
| parent | c8f24e50709fb690620f47a671fb3a5f708beb6b (diff) | |
| parent | 5a59c43e7af9d8697280eb44f87bb156258dae59 (diff) | |
Merge pull request #10020 from jtattermusch/reports_for_sponge
Make report naming internal-CI compliant
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 5f5df70d1d..47422451f8 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -49,6 +49,9 @@ _RUNTESTS_TIMEOUT = 4*60*60 # Number of jobs assigned to each run_tests.py instance _DEFAULT_INNER_JOBS = 2 +# report suffix is important for reports to get picked up by internal CI +_REPORT_SUFFIX = 'sponge_log.xml' + def _docker_jobspec(name, runtests_args=[], inner_jobs=_DEFAULT_INNER_JOBS): """Run a single instance of run_tests.py in a docker container""" @@ -57,7 +60,7 @@ def _docker_jobspec(name, runtests_args=[], inner_jobs=_DEFAULT_INNER_JOBS): '--use_docker', '-t', '-j', str(inner_jobs), - '-x', 'report_%s.xml' % name, + '-x', 'report_%s_%s' % (name, _REPORT_SUFFIX), '--report_suite_name', '%s' % name] + runtests_args, shortname='run_tests_%s' % name, timeout_seconds=_RUNTESTS_TIMEOUT) @@ -74,7 +77,7 @@ def _workspace_jobspec(name, runtests_args=[], workspace_name=None, inner_jobs=_ 'tools/run_tests/helper_scripts/run_tests_in_workspace.sh', '-t', '-j', str(inner_jobs), - '-x', '../report_%s.xml' % name, + '-x', '../report_%s_%s' % (name, _REPORT_SUFFIX), '--report_suite_name', '%s' % name] + runtests_args, environ=env, shortname='run_tests_%s' % name, @@ -415,7 +418,7 @@ if __name__ == "__main__": skipped_results = jobset.run(skipped_jobs, skip_jobs=True) resultset.update(skipped_results) - report_utils.render_junit_xml_report(resultset, 'report.xml', + report_utils.render_junit_xml_report(resultset, 'report_%s' % _REPORT_SUFFIX, suite_name='aggregate_tests') if num_failures == 0: |