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

Merge pull request #62588 from ClickHouse/ci_fast_t_in_mq

Browse Source 
CI: add FT to MQ remove Style from master
This commit is contained in:
Max K 2024-04-24 16:57:56 +00:00 committed by GitHub
commit 0ca2132b2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/workflows/master.yml vendored
View File

@ -59,16 +59,17 @@ jobs:
uses: ./.github/workflows/reusable_docker.yml
with:
data: ${{ needs.RunConfig.outputs.data }}
StyleCheck:
needs: [RunConfig, BuildDockers]
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Style check
runner_type: style-checker
data: ${{ needs.RunConfig.outputs.data }}
run_command: |
python3 style_check.py --no-push
# Tested in MQ
# StyleCheck:
# needs: [RunConfig, BuildDockers]
# if: ${{ !failure() && !cancelled() }}
# uses: ./.github/workflows/reusable_test.yml
# with:
# test_name: Style check
# runner_type: style-checker
# data: ${{ needs.RunConfig.outputs.data }}
# run_command: |
# python3 style_check.py --no-push
CompatibilityCheckX86:
needs: [RunConfig, BuilderDebRelease]
if: ${{ !failure() && !cancelled() }}

30
tests/ci/ci.py
View File

@ -1261,18 +1261,6 @@ def _print_results(result: Any, outfile: Optional[str], pretty: bool = False) ->
raise AssertionError(f"Unexpected type for 'res': {type(result)}")
def _update_config_for_docs_only(jobs_data: dict) -> None:
DOCS_CHECK_JOBS = [JobNames.DOCS_CHECK, JobNames.STYLE_CHECK]
print(f"NOTE: Will keep only docs related jobs: [{DOCS_CHECK_JOBS}]")
jobs_to_do = jobs_data.get("jobs_to_do", [])
jobs_data["jobs_to_do"] = [job for job in jobs_to_do if job in DOCS_CHECK_JOBS]
jobs_data["jobs_to_wait"] = {
job: params
for job, params in jobs_data["jobs_to_wait"].items()
if job in DOCS_CHECK_JOBS
}
def _configure_docker_jobs(docker_digest_or_latest: bool) -> Dict:
print("::group::Docker images check")
# generate docker jobs data
@ -1332,8 +1320,20 @@ def _configure_jobs(
jobs_to_skip: List[str] = []
digests: Dict[str, str] = {}
# FIXME: find better place for these config variables
DOCS_CHECK_JOBS = [JobNames.DOCS_CHECK, JobNames.STYLE_CHECK]
MQ_JOBS = [JobNames.STYLE_CHECK, JobNames.FAST_TEST]
if pr_info.has_changes_in_documentation_only():
print(f"WARNING: Only docs are changed - will run only [{DOCS_CHECK_JOBS}]")
if pr_info.is_merge_queue():
print(f"WARNING: It's a MQ run - will run only [{MQ_JOBS}]")
print("::group::Job Digests")
for job in CI_CONFIG.job_generator(pr_info.head_ref if CI else "dummy_branch_name"):
if pr_info.is_merge_queue() and job not in MQ_JOBS:
continue
if pr_info.has_changes_in_documentation_only() and job not in DOCS_CHECK_JOBS:
continue
digest = job_digester.get_job_digest(CI_CONFIG.get_digest_config(job))
digests[job] = digest
print(f" job [{job.rjust(50)}] has digest [{digest}]")
@ -1902,9 +1902,6 @@ def main() -> int:
else {}
)
if not args.skip_jobs and pr_info.has_changes_in_documentation_only():
_update_config_for_docs_only(jobs_data)
if not args.skip_jobs:
ci_cache = CiCache(s3, jobs_data["digests"])
@ -1928,8 +1925,7 @@ def main() -> int:
jobs_to_skip.append(job)
del jobs_params[job]
# set planned jobs as pending in the CI cache if on the master
if pr_info.is_master:
# set planned jobs as in-progress in CI cache
for job in jobs_data["jobs_to_do"]:
config = CI_CONFIG.get_job_config(job)
if config.run_always or config.run_by_label: