Skip to content

Commit 5d7a745

Browse files
authored
Merge branch '3.13' into backport-14512-to-3.13
2 parents 60da3d0 + e8c28a9 commit 5d7a745

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/system-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
persist-credentials: false
4141
repository: 'DataDog/system-tests'
4242
# Automatically managed, use scripts/update-system-tests-version to update
43-
ref: 'fef0bc7c0ba5f74babbb1ac3419291dbd4b65e5e'
43+
ref: '34158316a0588f3f64cd9320ab7c4cb7e8b91922'
4444

4545
- name: Checkout dd-trace-py
4646
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -90,7 +90,7 @@ jobs:
9090
persist-credentials: false
9191
repository: 'DataDog/system-tests'
9292
# Automatically managed, use scripts/update-system-tests-version to update
93-
ref: 'fef0bc7c0ba5f74babbb1ac3419291dbd4b65e5e'
93+
ref: '34158316a0588f3f64cd9320ab7c4cb7e8b91922'
9494

9595
- name: Build runner
9696
uses: ./.github/actions/install_runner
@@ -273,7 +273,7 @@ jobs:
273273
persist-credentials: false
274274
repository: 'DataDog/system-tests'
275275
# Automatically managed, use scripts/update-system-tests-version to update
276-
ref: 'fef0bc7c0ba5f74babbb1ac3419291dbd4b65e5e'
276+
ref: '34158316a0588f3f64cd9320ab7c4cb7e8b91922'
277277
- name: Checkout dd-trace-py
278278
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
279279
with:
@@ -312,4 +312,4 @@ jobs:
312312
run: exit 0
313313
- name: Fails if anything else failed
314314
if: needs.parametric.result != 'success' || needs.system-tests.result != 'success'
315-
run: exit 1
315+
run: exit 1

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variables:
1414
DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
1515
# CI_DEBUG_SERVICES: "true"
1616
# Automatically managed, use scripts/update-system-tests-version to update
17-
SYSTEM_TESTS_REF: "fef0bc7c0ba5f74babbb1ac3419291dbd4b65e5e"
17+
SYSTEM_TESTS_REF: "34158316a0588f3f64cd9320ab7c4cb7e8b91922"
1818

1919
default:
2020
interruptible: true
@@ -200,4 +200,4 @@ deploy_to_di_backend:manual:
200200
UPSTREAM_PIPELINE_ID: $CI_PIPELINE_ID
201201
UPSTREAM_COMMIT_AUTHOR: $CI_COMMIT_AUTHOR
202202
UPSTREAM_TAG: $CI_COMMIT_TAG
203-
UPSTREAM_PACKAGE_JOB: build
203+
UPSTREAM_PACKAGE_JOB: build

0 commit comments

Comments
 (0)