diff --git a/tests/ci/report.py b/tests/ci/report.py index d924be5885b..de124890ce7 100644 --- a/tests/ci/report.py +++ b/tests/ci/report.py @@ -34,6 +34,7 @@ th {{ cursor: pointer; }} Commit {additional_urls} Task (github actions) +Job (github actions)

{test_part} @@ -150,6 +151,7 @@ def create_test_html_report( test_result, raw_log_url, task_url, + job_url, branch_url, branch_name, commit_url, @@ -236,12 +238,17 @@ def create_test_html_report( [_get_html_url(url) for url in sorted(additional_urls, key=_get_html_url_name)] ) + raw_log_name = os.path.basename(raw_log_url) + if raw_log_name.endswith("?check_suite_focus=true"): + raw_log_name = "Job (github actions)" + result = HTML_BASE_TEST_TEMPLATE.format( title=_format_header(header, branch_name), header=_format_header(header, branch_name, branch_url), - raw_log_name=os.path.basename(raw_log_url), + raw_log_name=raw_log_name, raw_log_url=raw_log_url, task_url=task_url, + job_url=job_url, test_part=test_part, branch_name=branch_name, commit_url=commit_url, diff --git a/tests/ci/upload_result_helper.py b/tests/ci/upload_result_helper.py index 289fc4b3184..0fde4408176 100644 --- a/tests/ci/upload_result_helper.py +++ b/tests/ci/upload_result_helper.py @@ -2,7 +2,12 @@ import os import logging import ast -from env_helper import GITHUB_SERVER_URL, GITHUB_REPOSITORY, GITHUB_RUN_URL +from env_helper import ( + GITHUB_JOB_URL, + GITHUB_REPOSITORY, + GITHUB_RUN_URL, + GITHUB_SERVER_URL, +) from report import ReportColorTheme, create_test_html_report @@ -66,13 +71,11 @@ def upload_results( branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/pull/{pr_number}" commit_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commit/{commit_sha}" - task_url = GITHUB_RUN_URL - if additional_urls: raw_log_url = additional_urls[0] additional_urls.pop(0) else: - raw_log_url = task_url + raw_log_url = GITHUB_JOB_URL() statuscolors = ( ReportColorTheme.bugfixcheck if "bugfix validate check" in check_name else None @@ -82,7 +85,8 @@ def upload_results( check_name, test_results, raw_log_url, - task_url, + GITHUB_RUN_URL, + GITHUB_JOB_URL(), branch_url, branch_name, commit_url,