Skip to content
Open
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1778dfe
ci: forward BP_EXTERNAL_S3_URL through benchmark triggers
igoragoli Jul 9, 2026
92dc737
spike: echo BP_EXTERNAL_S3_URL in benchmarks base to verify var passing
igoragoli Jul 9, 2026
e481582
spike: remove BP_EXTERNAL_S3_URL echo
igoragoli Jul 9, 2026
c6bf817
ci: default BP_EXTERNAL_S3_URL to empty so trigger forwards a value, …
igoragoli Jul 10, 2026
cdec4a5
ci: simplify BP_EXTERNAL_S3_URL comment
igoragoli Jul 10, 2026
9647c96
Merge branch 'main' into augusto/forward-external-s3-url
igoragoli Jul 10, 2026
cdd3c0a
spike: echo forwarded BP_EXTERNAL_S3_URL then exit
igoragoli Jul 10, 2026
c29d3bf
ci: forward pipeline variables to benchmark child pipelines
igoragoli Jul 10, 2026
8bb5c70
ci: forward pipeline variables to benchmark child pipelines
igoragoli Jul 10, 2026
401b141
Merge branch 'main' into augusto/forward-external-s3-url
igoragoli Jul 11, 2026
c74b940
ci: bump BENCHMARKING_COMMIT_SHA to pick up S3 url override
igoragoli Jul 11, 2026
0380110
ci: point benchmarks at converted.json-upload branch for stability
igoragoli Jul 13, 2026
eafa982
ci: bump to benchmarking-platform converted.json dedup fix
igoragoli Jul 13, 2026
9813578
ci: bump to benchmarking-platform suffixed converted.json upload
igoragoli Jul 13, 2026
a800e85
ci: pin benchmarking-platform to merged dd-trace-py branch (#299)
igoragoli Jul 13, 2026
7d825dc
Merge branch 'main' into augusto/forward-external-s3-url
igoragoli Jul 13, 2026
2e50382
ci: drop redundant comment on benchmarking-platform pin
igoragoli Jul 13, 2026
ea2a0a5
Merge branch 'main' into augusto/forward-external-s3-url
igoragoli Jul 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ stages:
- release

variables:
# Benchmark trigger jobs forward $BP_EXTERNAL_S3_URL to downstream pipelines so
# an external orchestrator can override the S3 destination of benchmark results.
# Defaulted to empty here so an unset value forwards as "" rather than a literal.
BP_EXTERNAL_S3_URL: ""
REPO_LANG: python # "python" is used everywhere rather than "py"
REPO_NOTIFICATION_CHANNEL: "#apm-python-release"
RELEASE_ALLOW_TEST_FAILURES: false
Expand Down Expand Up @@ -186,6 +190,8 @@ microbenchmarks:
PARENT_PIPELINE_ID: $CI_PIPELINE_ID
# Disable VPA for benchmarks
DD_DISABLE_VPA: true
# Forward the external S3 destination override to the benchmark child pipeline.
BP_EXTERNAL_S3_URL: $BP_EXTERNAL_S3_URL
Comment thread
igoragoli marked this conversation as resolved.
Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Forward the S3 override without self-referencing

When a normal benchmark pipeline does not provide BP_EXTERNAL_S3_URL, this self-reference still resolves to the literal $BP_EXTERNAL_S3_URL rather than the empty default added at line 14: GitLab gives job variables higher precedence than top-level defaults, and its known same-name expansion bug (gitlab-org/gitlab#433964) leaves FOO: $FOO unexpanded. Fresh evidence beyond the previous thread is that the new default is only top-level, but this job-level variable overrides it before the child pipeline is created, so .gitlab/benchmarks/microbenchmarks.yml:60 will run the upload with a non-empty bogus override; line 224 has the same issue.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Valid. Changed the mechanism with which vars are forwarded.


apm-sdk-benchmarks:
stage: benchmarks
Expand Down Expand Up @@ -214,6 +220,8 @@ macrobenchmarks:
PARENT_PIPELINE_ID: $CI_PIPELINE_ID
# Disable VPA for benchmarks
DD_DISABLE_VPA: true
# Forward the external S3 destination override to the benchmark child pipeline.
BP_EXTERNAL_S3_URL: $BP_EXTERNAL_S3_URL
allow_failure: false
rules:
# Always run on nightly schedule or API triggered pipelines
Expand Down
Loading