diff --git a/.circleci/config.templ.yml b/.circleci/config.templ.yml index d8347ed8643..b26856fc533 100644 --- a/.circleci/config.templ.yml +++ b/.circleci/config.templ.yml @@ -4,7 +4,7 @@ default_resource_class: &default_resource_class medium ubuntu_base_image: &ubuntu_base_img ubuntu-2004:2023.04.2 cimg_base_image: &cimg_base_image cimg/base:2022.08 python310_image: &python310_image cimg/python:3.10.12 -ddtrace_dev_image: &ddtrace_dev_image ghcr.io/datadog/dd-trace-py/testrunner@sha256:8ca43d46ff34e078bd7bc0662e74e6be38547a98140a5cd4203805f6b214b583 +ddtrace_dev_image: &ddtrace_dev_image ghcr.io/datadog/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269 redis_image: &redis_image redis:4.0-alpine@sha256:3e99741f293147ff406657dda7644c2b88564b80a498cd00da8f905743449c9f memcached_image: &memcached_image memcached:1.5-alpine@sha256:48cb7207e3d34871893fa1628f3a4984375153e9942facf82e25935b0a633c8a cassandra_image: &cassandra_image cassandra:3.11.7@sha256:495e5752526f7e75d3ad85b6a6bbf3b79714321b17a44255a216c341e3baae11 diff --git a/.github/workflows/requirements-locks.yml b/.github/workflows/requirements-locks.yml index f64c17bc413..071d8a879a1 100644 --- a/.github/workflows/requirements-locks.yml +++ b/.github/workflows/requirements-locks.yml @@ -11,7 +11,7 @@ jobs: validate: name: Check requirements lockfiles runs-on: ubuntu-latest - container: ghcr.io/datadog/dd-trace-py/testrunner@sha256:8ca43d46ff34e078bd7bc0662e74e6be38547a98140a5cd4203805f6b214b583 + container: ghcr.io/datadog/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269 steps: - uses: actions/checkout@v4 with: diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml index 6f0de408e83..9d56afcdf09 100644 --- a/.gitlab/benchmarks.yml +++ b/.gitlab/benchmarks.yml @@ -84,7 +84,6 @@ benchmark-serverless: tags: ["arch:amd64"] when: on_success needs: [ "benchmark-serverless-trigger" ] - allow_failure: true script: - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/serverless-tools.git ./serverless-tools && cd ./serverless-tools - ./ci/check_trigger_status.sh diff --git a/.gitlab/testrunner.yml b/.gitlab/testrunner.yml index bdee810249a..f1fd4806506 100644 --- a/.gitlab/testrunner.yml +++ b/.gitlab/testrunner.yml @@ -1,5 +1,5 @@ .testrunner: - image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:7a2e802af76051f82d698919d2837eff18dbb48e + image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269 # DEV: we have a larger pool of amd64 runners, prefer that over arm64 tags: [ "arch:amd64" ] timeout: 20m diff --git a/.gitlab/tests.yml b/.gitlab/tests.yml index 01c36591e10..b4801698020 100644 --- a/.gitlab/tests.yml +++ b/.gitlab/tests.yml @@ -9,7 +9,7 @@ variables: # CI_DEBUG_SERVICES: "true" .testrunner: - image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:7a2e802af76051f82d698919d2837eff18dbb48e + image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269 # DEV: we have a larger pool of amd64 runners, prefer that over arm64 tags: [ "arch:amd64" ] timeout: 20m diff --git a/docker-compose.yml b/docker-compose.yml index af3e559e7f4..bed5a6ce8ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -152,7 +152,7 @@ services: - "127.0.0.1:5433:5433" testrunner: - image: ghcr.io/datadog/dd-trace-py/testrunner@sha256:8ca43d46ff34e078bd7bc0662e74e6be38547a98140a5cd4203805f6b214b583 + image: ghcr.io/datadog/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269 command: bash environment: - TOX_SKIP_DIST=True