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 #60652 from ClickHouse/ci_fix_await_on_master_only

Browse Source 
CI: await CI on master only
This commit is contained in:
Max K 2024-03-01 17:39:37 +01:00 committed by GitHub
commit 9bc9ca3bd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ci/ci.py
View File

@ -645,7 +645,7 @@ class CiCache:
if not jobs_with_params: if not jobs_with_params:
return {} return {}
poll_interval_sec = 300 poll_interval_sec = 300
TIMEOUT = 3600 TIMEOUT = 3590
MAX_ROUNDS_TO_WAIT = 6 MAX_ROUNDS_TO_WAIT = 6
MAX_JOB_NUM_TO_WAIT = 3 MAX_JOB_NUM_TO_WAIT = 3
await_finished: Dict[str, List[int]] = {} await_finished: Dict[str, List[int]] = {}
@ -1690,7 +1690,7 @@ def main() -> int:
if not args.skip_jobs: if not args.skip_jobs:
ci_cache = CiCache(s3, jobs_data["digests"]) ci_cache = CiCache(s3, jobs_data["digests"])
if pr_info.is_release_branch(): if pr_info.is_master():
# wait for pending jobs to be finished, await_jobs is a long blocking call # wait for pending jobs to be finished, await_jobs is a long blocking call
# wait pending jobs (for now only on release/master branches) # wait pending jobs (for now only on release/master branches)
ready_jobs_batches_dict = ci_cache.await_jobs( ready_jobs_batches_dict = ci_cache.await_jobs(