mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Re-enable Fast test in MQ
This commit is contained in:
parent
eb72c12b31
commit
0deb862c93
@ -442,7 +442,11 @@ def _configure_jobs(
|
|||||||
|
|
||||||
# filter jobs in accordance with ci settings
|
# filter jobs in accordance with ci settings
|
||||||
job_configs = ci_settings.apply(
|
job_configs = ci_settings.apply(
|
||||||
job_configs, pr_info.is_release, is_pr=pr_info.is_pr, labels=pr_info.labels
|
job_configs,
|
||||||
|
pr_info.is_release,
|
||||||
|
is_pr=pr_info.is_pr,
|
||||||
|
is_mq=pr_info.is_merge_queue,
|
||||||
|
labels=pr_info.labels,
|
||||||
)
|
)
|
||||||
|
|
||||||
# check jobs in ci cache
|
# check jobs in ci cache
|
||||||
|
@ -134,6 +134,7 @@ class CiSettings:
|
|||||||
job_config: JobConfig,
|
job_config: JobConfig,
|
||||||
is_release: bool,
|
is_release: bool,
|
||||||
is_pr: bool,
|
is_pr: bool,
|
||||||
|
is_mq: bool,
|
||||||
labels: Iterable[str],
|
labels: Iterable[str],
|
||||||
) -> bool: # type: ignore #too-many-return-statements
|
) -> bool: # type: ignore #too-many-return-statements
|
||||||
if self.do_not_test:
|
if self.do_not_test:
|
||||||
@ -189,7 +190,7 @@ class CiSettings:
|
|||||||
|
|
||||||
if job_config.release_only and not is_release:
|
if job_config.release_only and not is_release:
|
||||||
return False
|
return False
|
||||||
elif job_config.pr_only and not is_pr:
|
elif job_config.pr_only and not is_pr and not is_mq:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return not to_deny
|
return not to_deny
|
||||||
@ -199,6 +200,7 @@ class CiSettings:
|
|||||||
job_configs: Dict[str, JobConfig],
|
job_configs: Dict[str, JobConfig],
|
||||||
is_release: bool,
|
is_release: bool,
|
||||||
is_pr: bool,
|
is_pr: bool,
|
||||||
|
is_mq: bool,
|
||||||
labels: Iterable[str],
|
labels: Iterable[str],
|
||||||
) -> Dict[str, JobConfig]:
|
) -> Dict[str, JobConfig]:
|
||||||
"""
|
"""
|
||||||
@ -207,7 +209,7 @@ class CiSettings:
|
|||||||
res = {}
|
res = {}
|
||||||
for job, job_config in job_configs.items():
|
for job, job_config in job_configs.items():
|
||||||
if self._check_if_selected(
|
if self._check_if_selected(
|
||||||
job, job_config, is_release=is_release, is_pr=is_pr, labels=labels
|
job, job_config, is_release=is_release, is_pr=is_pr, is_mq=is_mq, labels=labels
|
||||||
):
|
):
|
||||||
res[job] = job_config
|
res[job] = job_config
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user