diff --git a/.gitlab/benchmarks/microbenchmarks.yml b/.gitlab/benchmarks/microbenchmarks.yml index 8c78d05ca16..bda5421cf93 100644 --- a/.gitlab/benchmarks/microbenchmarks.yml +++ b/.gitlab/benchmarks/microbenchmarks.yml @@ -4,11 +4,11 @@ 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 - BENCHMARKING_BRANCH: dd-trace-py + BENCHMARKING_BRANCH: brettlangdon/dd-trace-py.fix.parallel .benchmarks: stage: test @@ -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}" || :) diff --git a/.gitlab/download-wheels-from-gh-actions.sh b/.gitlab/download-wheels-from-gh-actions.sh index f01afcccfd0..df78ac12a7f 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="1f31ec2949802373ddf8c378f82c87511d4e4d74" + 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