Skip to content

Commit 8018ed7

Browse files
authored
Merge pull request #1023 from Altinity/builds/25.6/add_build_report_artifact
25.6 Add build report artifact
2 parents 4da3c3c + 26a35c7 commit 8018ed7

File tree

11 files changed

+42
-5
lines changed

11 files changed

+42
-5
lines changed

.github/workflows/backport_branches.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ jobs:
265265
python3 -m praktika run 'Build (amd_release)' --workflow "BackportPR" --ci |& tee ./ci/tmp/job.log
266266
fi
267267
268+
- name: Upload artifact build_report_package_release
269+
uses: actions/upload-artifact@v4
270+
with:
271+
name: build_report_package_release
272+
path: ./ci/tmp/artifact_report_build_amd_release.json
273+
268274
build_amd_asan:
269275
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
270276
needs: [config_workflow, dockers_build_amd, dockers_build_arm]

.github/workflows/master.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,12 @@ jobs:
308308
python3 -m praktika run 'Build (amd_release)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
309309
fi
310310
311+
- name: Upload artifact build_report_package_release
312+
uses: actions/upload-artifact@v4
313+
with:
314+
name: build_report_package_release
315+
path: ./ci/tmp/artifact_report_build_amd_release.json
316+
311317
build_amd_asan:
312318
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
313319
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]

.github/workflows/pull_request.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ jobs:
265265
python3 -m praktika run 'Build (amd_release)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
266266
fi
267267
268+
- name: Upload artifact build_report_package_release
269+
uses: actions/upload-artifact@v4
270+
with:
271+
name: build_report_package_release
272+
path: ./ci/tmp/artifact_report_build_amd_release.json
273+
268274
build_amd_asan:
269275
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
270276
needs: [config_workflow, dockers_build_amd, dockers_build_arm]

.github/workflows/release_branches.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,12 @@ jobs:
263263
python3 -m praktika run 'Build (amd_release)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
264264
fi
265265
266+
- name: Upload artifact build_report_package_release
267+
uses: actions/upload-artifact@v4
268+
with:
269+
name: build_report_package_release
270+
path: ./ci/tmp/artifact_report_build_amd_release.json
271+
266272
build_amd_asan:
267273
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
268274
needs: [config_workflow, dockers_build_amd, dockers_build_arm]

ci/defs/defs.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,8 @@ class ArtifactNames:
397397
FUZZERS = "FUZZERS"
398398
FUZZERS_CORPUS = "FUZZERS_CORPUS"
399399

400+
BUILD_REPORT_AMD_RELEASE = "build_report_package_release"
401+
400402
PERF_REPORTS_AMD_1 = "PERF_REPORTS_AMD_1"
401403
PERF_REPORTS_AMD_2 = "PERF_REPORTS_AMD_2"
402404
PERF_REPORTS_AMD_3 = "PERF_REPORTS_AMD_3"
@@ -505,6 +507,11 @@ class ArtifactConfigs:
505507
type=Artifact.Type.S3,
506508
path=f"{TEMP_DIR}/build/programs/*_seed_corpus.zip",
507509
)
510+
build_reports = Artifact.Config(
511+
name=ArtifactNames.BUILD_REPORT_AMD_RELEASE,
512+
type=Artifact.Type.GH,
513+
path="./ci/tmp/artifact_report_build_amd_release.json"
514+
)
508515
performance_reports = Artifact.Config(
509516
name="*",
510517
type=Artifact.Type.S3,

ci/defs/job_configs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ class JobConfigs:
180180
ArtifactNames.DEB_AMD_RELEASE,
181181
ArtifactNames.RPM_AMD_RELEASE,
182182
ArtifactNames.TGZ_AMD_RELEASE,
183+
ArtifactNames.BUILD_REPORT_AMD_RELEASE,
183184
],
184185
[
185186
ArtifactNames.CH_AMD_ASAN,

ci/praktika/validator.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,12 @@ def validate(cls):
160160
in Settings.S3_BUCKET_TO_HTTP_ENDPOINT
161161
), f"S3_BUCKET_TO_HTTP_ENDPOINT Setting must include bucket name [{Settings.HTML_S3_PATH}] from HTML_S3_PATH, workflow [{workflow.name}]"
162162

163-
if workflow.enable_cache:
164-
for artifact in workflow.artifacts or []:
165-
assert (
166-
artifact.is_s3_artifact()
167-
), f"All artifacts must be of S3 type if enable_cache|enable_html=True, artifact [{artifact.name}], type [{artifact.type}], workflow [{workflow.name}]"
163+
# NOTE(myrotk): the only GH artifact is build_reports and it is necessary
164+
# if workflow.enable_cache:
165+
# for artifact in workflow.artifacts or []:
166+
# assert (
167+
# artifact.is_s3_artifact()
168+
# ), f"All artifacts must be of S3 type if enable_cache|enable_html=True, artifact [{artifact.name}], type [{artifact.type}], workflow [{workflow.name}]"
168169

169170
if workflow.dockers and not workflow.disable_dockers_build:
170171
assert (

ci/workflows/backport_branches.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
*ArtifactConfigs.clickhouse_debians,
4747
*ArtifactConfigs.clickhouse_rpms,
4848
*ArtifactConfigs.clickhouse_tgzs,
49+
ArtifactConfigs.build_reports,
4950
],
5051
dockers=DOCKERS,
5152
secrets=SECRETS,

ci/workflows/master.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
*ArtifactConfigs.clickhouse_tgzs,
5050
ArtifactConfigs.fuzzers,
5151
ArtifactConfigs.fuzzers_corpus,
52+
ArtifactConfigs.build_reports,
5253
*ArtifactConfigs.performance_reports,
5354
],
5455
dockers=DOCKERS,

ci/workflows/pull_request.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
*ArtifactConfigs.clickhouse_tgzs,
6969
ArtifactConfigs.fuzzers,
7070
ArtifactConfigs.fuzzers_corpus,
71+
ArtifactConfigs.build_reports,
7172
# *ArtifactConfigs.performance_reports,
7273
],
7374
dockers=DOCKERS,

0 commit comments

Comments
 (0)