Skip to content

Fayssal/update bp infra #6924

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.

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

Merged
merged 18 commits into from
May 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 46 additions & 1 deletion .gitlab/benchmarks/macrobenchmarks.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
.setup:
script:
- mkdir -p ~/.aws
- /app/infra/tools/fetch-ssm-parameter.sh $AWS_EPHEMERAL_INFRA_PROFILE_SSM_PARAMETER > ~/.aws/config || exit $?
- export AWS_PROFILE=ephemeral-infra-ci
- export BP_INFRA_KEY_PAIR_NAME=$(cat ~/.aws/key-pair-name.txt)
- export BP_INFRA_KEY_PAIR_PRIVATE_KEY_PATH=~/.aws/key-pair-private-key.pem

stages:
- infra-update
- check-azure-pipeline
- benchmarks
- benchmarks-win

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

check_azure_pipeline:
stage: check-azure-pipeline
Expand All @@ -25,6 +34,42 @@ check_azure_pipeline:
rules:
- when: on_success

update-bp-infra:
stage: infra-update
tags: ["arch:amd64"]
interruptible: false
timeout: 3h
allow_failure: true
# Image created in the following job https://gitlab.ddbuild.io/DataDog/benchmarking-platform-tools/-/jobs/869830045
image: registry.ddbuild.io/images/benchmarking-platform-tools-ubuntu:dotnet-microbenchmarks-2

script:
- git clone --branch dd-trace-dotnet/macro https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform
- mkdir -p ~/.aws
- /app/infra/tools/fetch-ssm-parameter.sh $AWS_EPHEMERAL_INFRA_PROFILE_SSM_PARAMETER >> ~/.aws/config || exit $?
- aws ssm get-parameter --region "$AWS_REGION" --name "ci.${CI_PROJECT_NAME}.ephemeral-infra-ci.windows-benchmarking-key-pair-name" --with-decryption --query "Parameter.Value" --out text >> ~/.aws/key-pair-name.txt
- aws ssm get-parameter --region "$AWS_REGION" --name "ci.${CI_PROJECT_NAME}.ephemeral-infra-ci.windows-benchmarking-key-private-key" --with-decryption --query "Parameter.Value" --out text >> ~/.aws/key-pair-private-key.pem
- export AWS_PROFILE=ephemeral-infra-ci
- export BP_INFRA_KEY_PAIR_NAME=$(cat ~/.aws/key-pair-name.txt)
- export BP_INFRA_KEY_PAIR_PRIVATE_KEY_PATH=~/.aws/key-pair-private-key.pem
- infra launch --no-cleanup --provision ./platform/ephemeral-infra/provisions/macrobenchmark-ami.yaml --region "${AWS_REGION}" --bypass-stack-destroy
after_script:
- !reference [.setup, script]
- |
infra cleanup --provision ./platform/ephemeral-infra/provisions/macrobenchmark-ami.yaml \
--region "${AWS_REGION}" \
--bypass-stack-destroy
rules:
- when: manual
variables:
FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
AWS_REGION: "us-east-1"
CLEANUP: "false"
AWS_EPHEMERAL_INFRA_PROFILE_SSM_PARAMETER: "ci.dd-trace-dotnet.ephemeral-infra-ci.dd-trace-dotnet-profile"
AWS_EPHEMERAL_INFRA_PROFILE_NAME: "ephemeral-infra-ci"
AWS_EPHEMERAL_INFRA_ARTIFACTS_BUCKET_URI: "s3://windows-benchmarking-results/$CI_PROJECT_NAME/$CI_COMMIT_REF_NAME/$CI_JOB_ID"
AWS_EPHEMERAL_INFRA_REGION: "us-east-1"

.benchmarks:
stage: benchmarks
tags: ["runner:apm-k8s-same-cpu"]
Expand Down
38 changes: 38 additions & 0 deletions .gitlab/benchmarks/microbenchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,46 @@
- export BP_INFRA_KEY_PAIR_PRIVATE_KEY_PATH=~/.aws/key-pair-private-key.pem

stages:
- infra-update
- benchmarks

update-bp-infra:
stage: infra-update
timeout: 3h
tags: ["arch:amd64"]
interruptible: false
allow_failure: true
# Image created in the following job https://gitlab.ddbuild.io/DataDog/benchmarking-platform-tools/-/jobs/869830045
image: registry.ddbuild.io/images/benchmarking-platform-tools-ubuntu:dotnet-microbenchmarks-2

script:
- git clone --branch dd-trace-dotnet/micro https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform platform
- mkdir -p ~/.aws
- /app/infra/tools/fetch-ssm-parameter.sh $AWS_EPHEMERAL_INFRA_PROFILE_SSM_PARAMETER >> ~/.aws/config || exit $?
- aws ssm get-parameter --region "$AWS_REGION" --name "ci.${CI_PROJECT_NAME}.ephemeral-infra-ci.windows-benchmarking-key-pair-name" --with-decryption --query "Parameter.Value" --out text >> ~/.aws/key-pair-name.txt
- aws ssm get-parameter --region "$AWS_REGION" --name "ci.${CI_PROJECT_NAME}.ephemeral-infra-ci.windows-benchmarking-key-private-key" --with-decryption --query "Parameter.Value" --out text >> ~/.aws/key-pair-private-key.pem
- export AWS_PROFILE=ephemeral-infra-ci
- export BP_INFRA_KEY_PAIR_NAME=$(cat ~/.aws/key-pair-name.txt)
- export BP_INFRA_KEY_PAIR_PRIVATE_KEY_PATH=~/.aws/key-pair-private-key.pem
- infra launch --provision ./platform/ephemeral-infra/base-instance.yaml --region "${AWS_REGION}" --bypass-stack-destroy
after_script:
- !reference [.setup, script]
- |
infra cleanup --provision ./platform/ephemeral-infra/base-instance.yaml \
--region "${AWS_REGION}" \
--bypass-stack-destroy

rules:
- when: manual
variables:
FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
AWS_REGION: "us-east-1"
CLEANUP: "false"
AWS_EPHEMERAL_INFRA_PROFILE_SSM_PARAMETER: "ci.dd-trace-dotnet.ephemeral-infra-ci.dd-trace-dotnet-profile"
AWS_EPHEMERAL_INFRA_PROFILE_NAME: "ephemeral-infra-ci"
AWS_EPHEMERAL_INFRA_ARTIFACTS_BUCKET_URI: "s3://windows-benchmarking-results/$CI_PROJECT_NAME/$CI_COMMIT_REF_NAME/$CI_JOB_ID"
AWS_EPHEMERAL_INFRA_REGION: "us-east-1"

run-benchmarks:
stage: benchmarks
tags: ["arch:amd64"]
Expand Down
Loading