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

Merge pull request #59738 from ClickHouse/ci_arm_integration_fix_1

Browse Source 
CI: support batch specification in commit message
This commit is contained in:
Max K 2024-03-11 19:01:03 +01:00 committed by GitHub
commit 7676d71c5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tests/ci/ci.py
View File

@ -1192,13 +1192,13 @@ def _configure_jobs(
if batches_to_do:
jobs_to_do.append(job)
jobs_params[job] = {
"batches": batches_to_do,
"num_batches": num_batches,
}
elif add_to_skip:
# treat job as being skipped only if it's controlled by digest
jobs_to_skip.append(job)
jobs_params[job] = {
"batches": batches_to_do,
"num_batches": num_batches,
}
if not pr_info.is_release_branch():
# randomization bucket filtering (pick one random job from each bucket, for jobs with configured random_bucket property)
@ -1277,6 +1277,33 @@ def _configure_jobs(
jobs_to_do = list(
set(job for job in jobs_to_do_requested if job not in jobs_to_skip)
)
# if requested job does not have params in jobs_params (it happens for "run_by_label" job)
# we need to add params - otherwise it won't run as "batches" list will be empty
for job in jobs_to_do:
if job not in jobs_params:
num_batches = CI_CONFIG.get_job_config(job).num_batches
jobs_params[job] = {
"batches": list(range(num_batches)),
"num_batches": num_batches,
}
requested_batches = set()
for token in commit_tokens:
if token.startswith("batch_"):
try:
batches = [
int(batch) for batch in token.removeprefix("batch_").split("_")
]
except Exception:
print(f"ERROR: failed to parse commit tag [{token}]")
requested_batches.update(batches)
if requested_batches:
print(
f"NOTE: Only specific job batches were requested [{list(requested_batches)}]"
)
for job, params in jobs_params.items():
if params["num_batches"] > 1:
params["batches"] = list(requested_batches)
return {
"digests": digests,
@ -1381,7 +1408,11 @@ def _update_gh_statuses_action(indata: Dict, s3: S3Helper) -> None:
def _fetch_commit_tokens(message: str) -> List[str]:
pattern = r"#[\w-]+"
matches = [match[1:] for match in re.findall(pattern, message)]
res = [match for match in matches if match in Labels or match.startswith("job_")]
res = [
match
for match in matches
if match in Labels or match.startswith("job_") or match.startswith("batch_")
]
return res