Skip to content

Commit 2d4ca2f

Browse files
ianton-ruianton-ru
authored
Merge branch 'antalya-25.8' into bugfix/antalya-25.8/prefer_large_blocks
2 parents feb19c9 + 67a38d1 commit 2d4ca2f

File tree

108 files changed

+2998
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+2998
-217
lines changed

‎.github/workflows/master.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,25 +4172,25 @@ jobs:
41724172
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
41734173

41744174
RegressionTestsRelease:
4175-
needs: [config_workflow, build_amd_release]
4176-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
4175+
needs: [config_workflow, build_amd_binary]
4176+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression')}}
41774177
uses: ./.github/workflows/regression.yml
41784178
secrets: inherit
41794179
with:
41804180
runner_type: altinity-on-demand, altinity-regression-tester
4181-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4181+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41824182
arch: release
41834183
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41844184
timeout_minutes: 300
41854185
workflow_config: ${{ needs.config_workflow.outputs.data }}
41864186
RegressionTestsAarch64:
4187-
needs: [config_workflow, build_arm_release]
4188-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
4187+
needs: [config_workflow, build_arm_binary]
4188+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'aarch64')}}
41894189
uses: ./.github/workflows/regression.yml
41904190
secrets: inherit
41914191
with:
41924192
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
4193-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4193+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41944194
arch: aarch64
41954195
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41964196
timeout_minutes: 300

‎.github/workflows/pull_request.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4128,25 +4128,25 @@ jobs:
41284128
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
41294129

41304130
RegressionTestsRelease:
4131-
needs: [config_workflow, build_amd_release]
4132-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
4131+
needs: [config_workflow, build_amd_binary]
4132+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression')}}
41334133
uses: ./.github/workflows/regression.yml
41344134
secrets: inherit
41354135
with:
41364136
runner_type: altinity-on-demand, altinity-regression-tester
4137-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4137+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41384138
arch: release
41394139
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41404140
timeout_minutes: 300
41414141
workflow_config: ${{ needs.config_workflow.outputs.data }}
41424142
RegressionTestsAarch64:
4143-
needs: [config_workflow, build_arm_release]
4144-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
4143+
needs: [config_workflow, build_arm_binary]
4144+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'aarch64')}}
41454145
uses: ./.github/workflows/regression.yml
41464146
secrets: inherit
41474147
with:
41484148
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
4149-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4149+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41504150
arch: aarch64
41514151
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41524152
timeout_minutes: 300

‎.github/workflows/regression.yml‎

Lines changed: 54 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ env:
121121
build_sha: ${{ inputs.build_sha }}
122122
pr_number: ${{ github.event.number }}
123123
event_name: ${{ github.event_name }}
124+
version: ${{ fromJson(inputs.workflow_config).custom_data.version.string }}
125+
SKIP_LIST: ${{ join(fromJson(inputs.workflow_config).custom_data.ci_exclude_tags, '|') || '' }}
124126

125127
jobs:
126128
runner_labels_setup:
@@ -146,6 +148,9 @@ jobs:
146148
input: ${{ inputs.runner_type }}
147149

148150
Common:
151+
if: |
152+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
153+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'common')
149154
strategy:
150155
fail-fast: false
151156
matrix:
@@ -177,7 +182,7 @@ jobs:
177182
${{ inputs.workflow_config }}
178183
EOF
179184
180-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
185+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
181186
182187
- name: Run ${{ env.SUITE }} suite
183188
id: run_suite
@@ -210,6 +215,9 @@ jobs:
210215
path: ${{ env.artifact_paths}}
211216

212217
AggregateFunctions:
218+
if: |
219+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
220+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'aggregate_functions')
213221
strategy:
214222
fail-fast: false
215223
matrix:
@@ -242,7 +250,7 @@ jobs:
242250
${{ inputs.workflow_config }}
243251
EOF
244252
245-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
253+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
246254
247255
- name: Run ${{ env.SUITE }} suite
248256
id: run_suite
@@ -275,6 +283,9 @@ jobs:
275283
name: ${{ env.SUITE }}-${{ matrix.PART }}-${{ inputs.arch }}-artifacts
276284
path: ${{ env.artifact_paths}}
277285
Alter:
286+
if: |
287+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
288+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'alter')
278289
strategy:
279290
fail-fast: false
280291
matrix:
@@ -313,7 +324,7 @@ jobs:
313324
${{ inputs.workflow_config }}
314325
EOF
315326
316-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
327+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
317328
318329
- name: Run ${{ env.SUITE }} suite
319330
id: run_suite
@@ -347,6 +358,9 @@ jobs:
347358
path: ${{ env.artifact_paths}}
348359

349360
Benchmark:
361+
if: |
362+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
363+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'benchmark')
350364
strategy:
351365
fail-fast: false
352366
matrix:
@@ -379,7 +393,7 @@ jobs:
379393
${{ inputs.workflow_config }}
380394
EOF
381395
382-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
396+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
383397
384398
- name: Run ${{ env.SUITE }} suite
385399
id: run_suite
@@ -420,6 +434,9 @@ jobs:
420434
path: ${{ env.artifact_paths }}
421435

422436
ClickHouseKeeper:
437+
if: |
438+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
439+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'clickhouse_keeper')
423440
strategy:
424441
fail-fast: false
425442
matrix:
@@ -455,7 +472,7 @@ jobs:
455472
${{ inputs.workflow_config }}
456473
EOF
457474
458-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
475+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
459476
460477
- name: Run ${{ env.SUITE }} suite
461478
id: run_suite
@@ -489,6 +506,9 @@ jobs:
489506
path: ${{ env.artifact_paths }}
490507

491508
Iceberg:
509+
if: |
510+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
511+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'iceberg')
492512
strategy:
493513
fail-fast: false
494514
matrix:
@@ -527,7 +547,7 @@ jobs:
527547
${{ inputs.workflow_config }}
528548
EOF
529549
530-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
550+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
531551
532552
- name: Run ${{ env.SUITE }} suite
533553
id: run_suite
@@ -560,6 +580,9 @@ jobs:
560580
name: ${{ env.SUITE }}-${{ matrix.PART }}-${{ inputs.arch }}-artifacts
561581
path: ${{ env.artifact_paths}}
562582
LDAP:
583+
if: |
584+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
585+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'ldap')
563586
strategy:
564587
fail-fast: false
565588
matrix:
@@ -591,7 +614,7 @@ jobs:
591614
${{ inputs.workflow_config }}
592615
EOF
593616
594-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
617+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
595618
596619
- name: Run ${{ env.SUITE }} suite
597620
id: run_suite
@@ -624,6 +647,9 @@ jobs:
624647
path: ${{ env.artifact_paths }}
625648

626649
Parquet:
650+
if: |
651+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
652+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'parquet')
627653
needs: [runner_labels_setup]
628654
runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
629655
timeout-minutes: ${{ inputs.timeout_minutes }}
@@ -651,7 +677,7 @@ jobs:
651677
${{ inputs.workflow_config }}
652678
EOF
653679
654-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
680+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
655681
656682
- name: Run ${{ env.SUITE }} suite
657683
id: run_suite
@@ -684,6 +710,9 @@ jobs:
684710
path: ${{ env.artifact_paths }}
685711

686712
ParquetS3:
713+
if: |
714+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
715+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'parquet')
687716
strategy:
688717
fail-fast: false
689718
matrix:
@@ -716,7 +745,7 @@ jobs:
716745
${{ inputs.workflow_config }}
717746
EOF
718747
719-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
748+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
720749
721750
- name: Run ${{ env.SUITE }} suite
722751
id: run_suite
@@ -755,6 +784,9 @@ jobs:
755784

756785

757786
RBAC:
787+
if: |
788+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
789+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'rbac')
758790
strategy:
759791
fail-fast: false
760792
matrix:
@@ -787,7 +819,7 @@ jobs:
787819
${{ inputs.workflow_config }}
788820
EOF
789821
790-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
822+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
791823
792824
- name: Run ${{ env.SUITE }} suite
793825
id: run_suite
@@ -820,6 +852,9 @@ jobs:
820852
name: ${{ env.SUITE }}-${{ matrix.PART }}-${{ inputs.arch }}-artifacts
821853
path: ${{ env.artifact_paths}}
822854
SSLServer:
855+
if: |
856+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
857+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'ssl_server')
823858
strategy:
824859
fail-fast: false
825860
matrix:
@@ -852,7 +887,7 @@ jobs:
852887
${{ inputs.workflow_config }}
853888
EOF
854889
855-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
890+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
856891
857892
- name: Run ${{ env.SUITE }} suite
858893
id: run_suite
@@ -886,6 +921,9 @@ jobs:
886921
path: ${{ env.artifact_paths}}
887922

888923
S3:
924+
if: |
925+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
926+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 's3')
889927
strategy:
890928
fail-fast: false
891929
matrix:
@@ -923,7 +961,7 @@ jobs:
923961
${{ inputs.workflow_config }}
924962
EOF
925963
926-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
964+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
927965
928966
- name: Run ${{ env.SUITE }} suite
929967
id: run_suite
@@ -968,6 +1006,9 @@ jobs:
9681006
path: ${{ env.artifact_paths}}
9691007

9701008
TieredStorage:
1009+
if: |
1010+
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
1011+
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'tiered_storage')
9711012
strategy:
9721013
fail-fast: false
9731014
matrix:
@@ -1000,7 +1041,7 @@ jobs:
10001041
${{ inputs.workflow_config }}
10011042
EOF
10021043
1003-
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }}
1044+
python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha }} --binary
10041045
10051046
- name: Run ${{ env.SUITE }} suite
10061047
id: run_suite

‎ci/jobs/scripts/workflow_hooks/filter_job.py‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import re
2-
from functools import lru_cache
3-
41
from ci.defs.defs import JobNames
52
from ci.defs.job_configs import JobConfigs
63
from ci.jobs.scripts.workflow_hooks.new_tests_check import (
@@ -52,15 +49,6 @@ def only_docs(changed_files):
5249
_info_cache = None
5350

5451

55-
@lru_cache
56-
def get_ci_exclude_tags(pr_body):
57-
pattern = r"(#|- \[x\] +<!---ci_exclude_)([|\w]+)"
58-
matches = []
59-
for match in re.findall(pattern, pr_body):
60-
matches.extend(match[-1].split("|"))
61-
return matches
62-
63-
6452
def should_skip_job(job_name):
6553
global _info_cache
6654
if _info_cache is None:
@@ -179,7 +167,7 @@ def should_skip_job(job_name):
179167
return False, ""
180168
return True, "Skipped, not labeled with 'pr-performance'"
181169

182-
ci_exclude_tags = get_ci_exclude_tags(_info_cache.pr_body)
170+
ci_exclude_tags = _info_cache.get_kv_data("ci_exclude_tags") or []
183171
for tag in ci_exclude_tags:
184172
if tag in job_name:
185173
return True, f"Skipped, job name includes excluded tag '{tag}'"

‎ci/jobs/scripts/workflow_hooks/parse_ci_tags.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import re
2+
3+
from ci.praktika.info import Info
4+
5+
6+
def get_ci_tags(pr_body, tag_prefix):
7+
pattern = rf"(- \[x\] +<!---{tag_prefix}_)([|\w]+)"
8+
matches = []
9+
for match in re.findall(pattern, pr_body):
10+
matches.extend(match[-1].split("|"))
11+
return matches
12+
13+
14+
if __name__ == "__main__":
15+
info = Info()
16+
17+
info.store_kv_data("ci_exclude_tags", get_ci_tags(info.pr_body, "ci_exclude"))
18+
info.store_kv_data("ci_regression_jobs", get_ci_tags(info.pr_body, "ci_regression"))

‎ci/praktika/native_jobs.py‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,23 @@ def check_affected_jobs():
398398

399399
affected_artifacts = []
400400
unaffected_jobs_with_artifacts = {}
401-
# NOTE (strtgbb): We always want the build artifacts for our report and regression tests.
401+
all_required_artifacts = set()
402+
403+
# NOTE (strtgbb): We always want these build artifacts for our report and regression tests.
402404
# If we make FinishCIReport and regression tests into praktika jobs, we can remove this.
403-
all_required_artifacts = set(["CH_AMD_RELEASE", "CH_ARM_RELEASE"])
405+
if "CIReport" in workflow.additional_jobs:
406+
all_required_artifacts.update(["CH_AMD_RELEASE", "CH_ARM_RELEASE"])
407+
if (
408+
"Regression" in workflow.additional_jobs
409+
and "regression"
410+
not in workflow_config.custom_data.get("ci_exclude_tags", [])
411+
):
412+
all_required_artifacts.update(["CH_AMD_BINARY"])
413+
if "aarch64" not in workflow_config.custom_data.get(
414+
"ci_exclude_tags", []
415+
):
416+
all_required_artifacts.update(["CH_ARM_BINARY"])
417+
print(f"Including artifacts for custom jobs [{all_required_artifacts}]")
404418

405419
for job in workflow.jobs:
406420
# Skip native Praktika jobs

0 commit comments

Comments
 (0)