Skip to content

Commit aad3d6f

Browse files
authored
[Benchmarks] Update microbenchmarks (#6868)
## Summary of changes This PR updates the microbenchmarks: - The microbenchmarks now run a new fixed version of the tooling - Benchmarks run on every commit and publish results only on PRs - When a job is cancelled, the spawned infrastructure is deleted (otherwise it hangs and creates extra cost before scheduled cleanup), [example of cancelled job with destruction of spawned infrastructure](https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-dotnet/-/jobs/901198114) - Uses a more conventional naming for branch ## Reason for change - Noticed some extra unplanned costs. - Need to update tooling version ## Implementation details ## Test coverage ## Other details <!-- Fixes #{issue} --> <!-- ⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. -->
1 parent 3c9ccda commit aad3d6f

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,4 @@ microbenchmarks:
220220
trigger:
221221
include: .gitlab/benchmarks/microbenchmarks.yml
222222
allow_failure: true
223-
rules:
224-
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"'
225-
when: always
226-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $BENCHMARK_RUN == "true"'
227-
when: always
228-
- when: manual
229223

.gitlab/benchmarks/microbenchmarks.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
.setup:
2+
script:
3+
- mkdir -p ~/.aws
4+
- /app/infra/tools/fetch-ssm-parameter.sh $AWS_EPHEMERAL_INFRA_PROFILE_SSM_PARAMETER > ~/.aws/config || exit $?
5+
- export AWS_PROFILE=ephemeral-infra-ci
6+
- export BP_INFRA_KEY_PAIR_NAME=$(cat ~/.aws/key-pair-name.txt)
7+
- export BP_INFRA_KEY_PAIR_PRIVATE_KEY_PATH=~/.aws/key-pair-private-key.pem
8+
19
stages:
210
- benchmarks
311

@@ -7,11 +15,17 @@ run-benchmarks:
715
interruptible: true
816
timeout: 1h
917
# Image created in the following job https://gitlab.ddbuild.io/DataDog/benchmarking-platform-tools/-/jobs/869830045
10-
image: registry.ddbuild.io/images/benchmarking-platform-tools-ubuntu:dotnet-microbenchmarks
18+
image: registry.ddbuild.io/images/benchmarking-platform-tools-ubuntu:dotnet-microbenchmarks-2
1119

1220
script:
13-
- git clone --branch fayssal/test-micro-delivery https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform
21+
- git clone --branch dd-trace-dotnet/micro https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform
1422
- ./platform/steps/launch-instance.sh
23+
after_script:
24+
- !reference [.setup, script]
25+
- |
26+
infra cleanup --provision ./platform/ephemeral-infra/ephemeral-instance-main.yaml \
27+
--region "${AWS_REGION}" \
28+
--bypass-stack-destroy
1529
- ./platform/steps/post-pr-comment.sh
1630
# Temporarely commented out pending issue resolution with sending files to backend
1731
# - ./platform/steps/upload-to-bp-ui.sh

0 commit comments

Comments
 (0)