Skip to content

Commit ebb8a90

Browse files
test: update system tests (#15767)
This updates system tests to pick up fixes for Injection tests which are currently breaking our CI. (cherry picked from commit c5b5e17)
1 parent 6f8d74b commit ebb8a90

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.github/workflows/system-tests.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
persist-credentials: false
4646
repository: 'DataDog/system-tests'
4747
# Automatically managed, use scripts/update-system-tests-version to update
48-
ref: '8a7e882da2fac43eb7352acfb2bc41e3457ec4e3'
48+
ref: '9417552bee3dd45313249fc8bf889a008c88ebb4'
4949

5050
- name: Download wheels to binaries directory
5151
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -90,7 +90,11 @@ jobs:
9090
persist-credentials: false
9191
repository: 'DataDog/system-tests'
9292
# Automatically managed, use scripts/update-system-tests-version to update
93+
<<<<<<< HEAD
9394
ref: '8a7e882da2fac43eb7352acfb2bc41e3457ec4e3'
95+
=======
96+
ref: '9417552bee3dd45313249fc8bf889a008c88ebb4'
97+
>>>>>>> c5b5e17c48 (test: update system tests (#15767))
9498

9599
- name: Build runner
96100
uses: ./.github/actions/install_runner
@@ -275,7 +279,11 @@ jobs:
275279
persist-credentials: false
276280
repository: 'DataDog/system-tests'
277281
# Automatically managed, use scripts/update-system-tests-version to update
282+
<<<<<<< HEAD
278283
ref: '8a7e882da2fac43eb7352acfb2bc41e3457ec4e3'
284+
=======
285+
ref: '9417552bee3dd45313249fc8bf889a008c88ebb4'
286+
>>>>>>> c5b5e17c48 (test: update system tests (#15767))
279287
- name: Download wheels to binaries directory
280288
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
281289
with:
@@ -312,5 +320,9 @@ jobs:
312320
if: needs.parametric.result == 'success' && needs.system-tests.result == 'success'
313321
run: exit 0
314322
- name: Fails if anything else failed
323+
<<<<<<< HEAD
315324
if: needs.parametric.result != 'success' || needs.system-tests.result != 'success'
325+
=======
326+
if: needs.parametric.result != 'success' || needs.system-tests.result != 'success' || needs.serverless-system-tests.result != 'success'
327+
>>>>>>> c5b5e17c48 (test: update system tests (#15767))
316328
run: exit 1

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
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: "8a7e882da2fac43eb7352acfb2bc41e3457ec4e3"
17+
SYSTEM_TESTS_REF: "9417552bee3dd45313249fc8bf889a008c88ebb4"
1818

1919
default:
2020
interruptible: true

0 commit comments

Comments
 (0)