Skip to content

25.3 ensure matching branch name in report queries #1142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strtgbb merged 4 commits into from
Nov 21, 2025
Merged

25.3 ensure matching branch name in report queries #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7f6c45
ensure matching branch name in report queries
strtgbb Nov 14, 2025
f1d0d12
Use correct refs inserting to db
strtgbb Nov 18, 2025
69d5266
try to fix tag support in report fails query
strtgbb Nov 19, 2025
db41ba7
cross out unstable 03315_executable_table_function_threads
strtgbb Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/actions/create_workflow_report/create_workflow_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def get_checks_fails(client: Client, commit_sha: str, branch_name: str):
report_url as results_link,
task_url
FROM `gh-data`.checks
WHERE commit_sha='{commit_sha}'
WHERE commit_sha='{commit_sha}' AND head_ref IN ('{branch_name}', 'refs/tags/{branch_name}')
GROUP BY check_name, test_name, report_url, task_url
)
WHERE test_status IN ('FAIL', 'ERROR')
Expand Down Expand Up @@ -192,7 +192,7 @@ def get_checks_known_fails(
report_url as results_link,
task_url
FROM `gh-data`.checks
WHERE commit_sha='{commit_sha}'
WHERE commit_sha='{commit_sha}' AND head_ref IN ('{branch_name}', 'refs/tags/{branch_name}')
GROUP BY check_name, test_name, report_url, task_url
)
WHERE test_status='BROKEN'
Expand Down Expand Up @@ -229,7 +229,7 @@ def get_checks_errors(client: Client, commit_sha: str, branch_name: str):
report_url as results_link,
task_url
FROM `gh-data`.checks
WHERE commit_sha='{commit_sha}'
WHERE commit_sha='{commit_sha}' AND head_ref IN ('{branch_name}', 'refs/tags/{branch_name}')
GROUP BY check_name, test_name, report_url, task_url
)
WHERE job_status=='error'
Expand Down
3 changes: 3 additions & 0 deletions tests/broken_tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"03203_hive_style_partitioning": {
"reason": "INVESTIGATE - new fail in 24.12"
},
"03315_executable_table_function_threads": {
"reason": "INVESTIGATE - unstable, timeout"
},
"00988_expansion_aliases_limit": {
"reason": "INVESTIGATE - Timeout on TSAN"
},
Expand Down
17 changes: 11 additions & 6 deletions tests/ci/clickhouse_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@

import requests

from env_helper import CLICKHOUSE_TEST_STAT_URL, CLICKHOUSE_TEST_STAT_PASSWORD, CLICKHOUSE_TEST_STAT_LOGIN
from env_helper import (
GITHUB_REPOSITORY,
CLICKHOUSE_TEST_STAT_URL,
CLICKHOUSE_TEST_STAT_PASSWORD,
CLICKHOUSE_TEST_STAT_LOGIN,
)
from get_robot_token import get_parameter_from_ssm
from pr_info import PRInfo
from report import TestResults
Expand Down Expand Up @@ -212,11 +217,11 @@ def prepare_tests_results_for_clickhouse(
report_url: str,
check_name: str,
) -> List[dict]:
pull_request_url = "https://github.com/Altinity/ClickHouse/commits/master"
base_ref = "master"
head_ref = "master"
base_repo = pr_info.repo_full_name
head_repo = pr_info.repo_full_name
base_ref = pr_info.base_ref
base_repo = pr_info.base_name
head_ref = pr_info.head_ref
head_repo = pr_info.head_name
pull_request_url = f"https://github.com/{GITHUB_REPOSITORY}/commits/{head_ref}"
if pr_info.number != 0:
pull_request_url = pr_info.pr_html_url

Expand Down
Loading