Skip to content

Set benchmarking jobs as interruptible when outside master #7841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Set benchmarking jobs as interruptible when outside master #7841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1bb05c4
set benchmarking jobs to interruptible outside master
igoragoli Nov 19, 2025
d8a88ee
consolidate all microbenchmarking artifacts into platform/artifacts
igoragoli Nov 19, 2025
cfb345a
trigger ci
igoragoli Nov 19, 2025
a1f75a3
set workflow:auto_cancel:on_new_commit: interruptible for micro and m…
igoragoli Nov 19, 2025
1cd3cd2
trigger ci
igoragoli Nov 19, 2025
a95a4f9
trigger ci
igoragoli Nov 19, 2025
3418ba5
don't interrupt release or hotfix benchmarks
igoragoli Nov 20, 2025
12d8262
don't interrupt throughput tests on master/release/hotfix refs
igoragoli Nov 20, 2025
b8f9a7a
fix patterns
igoragoli Nov 20, 2025
e34f653
set workflow:auto_cancel:on_new_commit: interruptible on dsm-throughp…
igoragoli Nov 20, 2025
badbde1
trigger ci
igoragoli Nov 20, 2025
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
15 changes: 12 additions & 3 deletions .gitlab/benchmarks/dsm-throughput.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ stages:
- check-azure-pipeline
- benchmarks

workflow:
auto_cancel:
on_new_commit: interruptible

check_azure_pipeline:
stage: check-azure-pipeline
image: $MACROBENCHMARKS_CI_IMAGE
Expand All @@ -21,15 +25,17 @@ check_azure_pipeline:
expire_in: 3 months
tags: ["arch:amd64"]
timeout: 1h
when: on_success
rules:
- when: on_success
- if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^hotfix.*$/ || $CI_COMMIT_REF_NAME =~ /^release.*$/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/
interruptible: false
- interruptible: true

dsm_throughput:
stage: benchmarks
tags: ["runner:apm-k8s-same-cpu"]
needs: ["check_azure_pipeline"]
image: $DSM_THROUGHPUT_CI_IMAGE
interruptible: true
timeout: 1h
script:
- source build-id.txt
Expand All @@ -44,5 +50,8 @@ dsm_throughput:
paths:
- artifacts/
expire_in: 3 months
when: on_success
rules:
- when: on_success
- if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^hotfix.*$/ || $CI_COMMIT_REF_NAME =~ /^release.*$/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/
interruptible: false
- interruptible: true
26 changes: 20 additions & 6 deletions .gitlab/benchmarks/macrobenchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ stages:
- benchmarks
- benchmarks-win

workflow:
auto_cancel:
on_new_commit: interruptible
Comment on lines +15 to +17
Copy link
Member

@andrewlock andrewlock Nov 19, 2025

Choose a reason for hiding this comment

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

I think we have DSM throughput tests too - maybe we should update those similarly @robcarlan-datadog?

Copy link
Contributor Author

@igoragoli igoragoli Nov 20, 2025

Choose a reason for hiding this comment

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

Thanks! I wasn't aware those jobs also used APM runners. Added the same interrupt policy to them 👍


variables:
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-8

Expand All @@ -30,8 +34,11 @@ check_azure_pipeline:
expire_in: 3 months
tags: ["arch:amd64"]
timeout: 1h
when: on_success
rules:
- when: on_success
- if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^hotfix.*$/ || $CI_COMMIT_REF_NAME =~ /^release.*$/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/
interruptible: false
- interruptible: true

update-bp-infra:
stage: infra-update
Expand Down Expand Up @@ -81,8 +88,11 @@ update-bp-infra:
- scheduler_failure
- api_failure
- script_failure
when: on_success
rules:
- when: on_success
- if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^hotfix.*$/ || $CI_COMMIT_REF_NAME =~ /^release.*$/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/
interruptible: false
- interruptible: true
image: $MACROBENCHMARKS_CI_IMAGE
script:
- source build-id.txt
Expand Down Expand Up @@ -263,10 +273,12 @@ profiler_cpu_timer_create-x86:
- scheduler_failure
- api_failure
- script_failure
when: on_success
rules:
- when: on_success
- if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^hotfix.*$/ || $CI_COMMIT_REF_NAME =~ /^release.*$/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/
interruptible: false
- interruptible: true
image: $MACROBENCHMARKS_CI_IMAGE

script:
- source build-id.txt
- echo "Building for the following build https://dev.azure.com/datadoghq/dd-trace-dotnet/_build/results?buildId=$buildId&view=results"
Expand Down Expand Up @@ -447,7 +459,6 @@ profiler_cpu_timer_create-arm64:
needs: ["check_azure_pipeline"]
tags: ["arch:amd64"]
image: registry.ddbuild.io/images/benchmarking-platform-tools-ubuntu:dd-trace-dotnet-macro
interruptible: true
timeout: 2h
retry:
max: 2
Expand All @@ -458,8 +469,11 @@ profiler_cpu_timer_create-arm64:
- scheduler_failure
- api_failure
- script_failure
when: on_success
rules:
- when: on_success
- if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^hotfix.*$/ || $CI_COMMIT_REF_NAME =~ /^release.*$/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/
interruptible: false
- interruptible: true
artifacts:
name: "artifacts"
when: always
Expand Down
10 changes: 8 additions & 2 deletions .gitlab/benchmarks/microbenchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ stages:
- build
- benchmarks

workflow:
auto_cancel:
on_new_commit: interruptible

build-dd-trace-dotnet-microbenchmarks-ami:
stage: build
tags: ["arch:amd64"]
Expand Down Expand Up @@ -78,14 +82,16 @@ run-benchmarks:
id_tokens:
DDOCTOSTS_ID_TOKEN:
aud: dd-octo-sts
when: on_success
rules:
- when: on_success
- if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^hotfix.*$/ || $CI_COMMIT_REF_NAME =~ /^release.*$/ || $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-prerelease)?$/
interruptible: false
- interruptible: true
artifacts:
name: "artifacts"
when: always
paths:
- platform/artifacts
- artifacts
expire_in: 3 months
variables:
# Allows ephemeral instances to read content from benchmarking-platform
Expand Down
Loading