From 9f1cf21577f3332d661699f1343a510e0122edca Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Thu, 17 Apr 2025 08:30:59 -0400 Subject: [PATCH 1/4] test new bp script --- .gitlab/benchmarks/microbenchmarks.yml | 2 +- .gitlab/download-wheels-from-gh-actions.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab/benchmarks/microbenchmarks.yml b/.gitlab/benchmarks/microbenchmarks.yml index ee383f26ec2..53fb01a52bf 100644 --- a/.gitlab/benchmarks/microbenchmarks.yml +++ b/.gitlab/benchmarks/microbenchmarks.yml @@ -8,7 +8,7 @@ variables: MICROBENCHMARKS_CI_IMAGE: $BENCHMARKING_IMAGE_REGISTRY/ci/benchmarking-platform:dd-trace-py PACKAGE_IMAGE: registry.ddbuild.io/images/mirror/pypa/manylinux2014_x86_64:2024-08-12-7fde9b1 GITHUB_CLI_IMAGE: registry.ddbuild.io/github-cli:v27480869-eafb11d-2.43.0 - BENCHMARKING_BRANCH: dd-trace-py + BENCHMARKING_BRANCH: brettlangdon/dd-trace-py.fix.parallel .benchmarks: stage: test diff --git a/.gitlab/download-wheels-from-gh-actions.sh b/.gitlab/download-wheels-from-gh-actions.sh index f01afcccfd0..51d25ffdfa2 100755 --- a/.gitlab/download-wheels-from-gh-actions.sh +++ b/.gitlab/download-wheels-from-gh-actions.sh @@ -1,6 +1,8 @@ #!/bin/bash set -eo pipefail +CI_COMMIT_SHA="7d11f1a8063b4af80695ddc96e0ce30f4370a565" + if [ -z "$CI_COMMIT_SHA" ]; then echo "Error: CI_COMMIT_SHA was not provided" exit 1 @@ -42,7 +44,7 @@ if [[ $(gh run view $RUN_ID --exit-status --json status --jq .status) != "comple echo "Waiting for workflow to finish" # Give time to the job to finish - sleep 300 # 5 minutes + sleep 5 # 5 minutes # wait for run to finish gh run watch $RUN_ID --interval 60 --exit-status 1 --repo DataDog/dd-trace-py From 1f31ec2949802373ddf8c378f82c87511d4e4d74 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 14 May 2025 14:51:43 -0400 Subject: [PATCH 2/4] use registry.ddbuild.io image --- .gitlab/benchmarks/microbenchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/benchmarks/microbenchmarks.yml b/.gitlab/benchmarks/microbenchmarks.yml index db2af5e0ae7..eaa8743731b 100644 --- a/.gitlab/benchmarks/microbenchmarks.yml +++ b/.gitlab/benchmarks/microbenchmarks.yml @@ -4,7 +4,7 @@ stages: - report variables: - BENCHMARKING_IMAGE_REGISTRY: 486234852809.dkr.ecr.us-east-1.amazonaws.com + BENCHMARKING_IMAGE_REGISTRY: registry.ddbuild.io MICROBENCHMARKS_CI_IMAGE: $BENCHMARKING_IMAGE_REGISTRY/ci/benchmarking-platform:dd-trace-py PACKAGE_IMAGE: registry.ddbuild.io/images/mirror/pypa/manylinux2014_x86_64:2024-08-12-7fde9b1 GITHUB_CLI_IMAGE: registry.ddbuild.io/github-cli:v27480869-eafb11d-2.43.0 From f5f5b7e204ed2e036a81513bf6527ff34feea356 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 14 May 2025 15:07:51 -0400 Subject: [PATCH 3/4] update static commit sha --- .gitlab/download-wheels-from-gh-actions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/download-wheels-from-gh-actions.sh b/.gitlab/download-wheels-from-gh-actions.sh index 51d25ffdfa2..df78ac12a7f 100755 --- a/.gitlab/download-wheels-from-gh-actions.sh +++ b/.gitlab/download-wheels-from-gh-actions.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eo pipefail -CI_COMMIT_SHA="7d11f1a8063b4af80695ddc96e0ce30f4370a565" +CI_COMMIT_SHA="1f31ec2949802373ddf8c378f82c87511d4e4d74" if [ -z "$CI_COMMIT_SHA" ]; then echo "Error: CI_COMMIT_SHA was not provided" From 2ba36b2dcbf0435c137e5f372af61a157605410f Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 14 May 2025 15:13:01 -0400 Subject: [PATCH 4/4] install parallel --- .gitlab/benchmarks/microbenchmarks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/benchmarks/microbenchmarks.yml b/.gitlab/benchmarks/microbenchmarks.yml index eaa8743731b..bda5421cf93 100644 --- a/.gitlab/benchmarks/microbenchmarks.yml +++ b/.gitlab/benchmarks/microbenchmarks.yml @@ -18,6 +18,8 @@ variables: interruptible: true timeout: 30m dependencies: [ "baseline:build", "candidate" ] + before_script: + - apt-get update && apt-get install -y --no-install-recommends parallel script: | export REPORTS_DIR="$(pwd)/reports/" && (mkdir "${REPORTS_DIR}" || :)