thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63045 from ClickHouse/ci_one_more_fix_for_ft_in_mq

Browse Source 
CI: fix job config for MQ
This commit is contained in:
Max K 2024-04-26 15:24:38 +00:00 committed by GitHub
commit ab29a5f428
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/ci/ci.py
View File

@ -1365,10 +1365,9 @@ def _configure_jobs(
batches_to_do: List[int] = []
add_to_skip = False
if job_config.pr_only and (
pr_info.is_release_branch and not pr_info.is_merge_queue
):
# run only in PR's wf and in the MQ wf
if pr_info.is_merge_queue and job not in MQ_JOBS:
continue
if job_config.pr_only and pr_info.is_release_branch:
continue
if job_config.release_only and not pr_info.is_release_branch:
continue
@ -1449,12 +1448,6 @@ def _configure_jobs(
jobs_to_do, jobs_to_skip, jobs_params
)
if pr_info.is_merge_queue:
# FIXME: Quick support for MQ workflow which is only StyleCheck for now
jobs_to_do = [JobNames.STYLE_CHECK]
jobs_to_skip = []
print(f"NOTE: This is Merge Queue CI: set jobs to do: [{jobs_to_do}]")
return {
"digests": digests,
"jobs_to_do": jobs_to_do,

2
tests/ci/pr_info.py
View File

@ -318,7 +318,7 @@ class PRInfo:
@property
def is_release_branch(self) -> bool:
return self.number == 0
return self.number == 0 and not self.is_merge_queue
@property
def is_pr(self):