Skip to content

Commit c1cee50

Browse files
committed
ci: enable test mode ru with sanitizers
1 parent dd5f13e commit c1cee50

File tree

4 files changed

+37
-12
lines changed

4 files changed

+37
-12
lines changed

.gitlab/ci/e2e.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,8 @@ test mode ru:
400400

401401
test mode ru tsan:
402402
extends: test mode ru
403-
when: manual
404-
allow_failure: true
403+
variables:
404+
MARKERS: "test_mode_not_crash"
405405
needs:
406406
- job: "basic tsan"
407407
artifacts: true
@@ -410,8 +410,8 @@ test mode ru tsan:
410410

411411
test mode ru asan:
412412
extends: test mode ru
413-
when: manual
414-
allow_failure: true
413+
variables:
414+
MARKERS: "test_mode_not_crash"
415415
needs:
416416
- job: "basic asan"
417417
artifacts: true
@@ -420,8 +420,8 @@ test mode ru asan:
420420

421421
test mode ru memcheck:
422422
extends: test mode ru
423-
when: manual
424-
allow_failure: true
423+
variables:
424+
MARKERS: "test_mode_not_crash"
425425
needs:
426426
- job: "basic memcheck"
427427
artifacts: true

.gitlab/ci/e2e/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
22
RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
3-
RETINA_VERSION=0.46.2
3+
RETINA_VERSION=0.46.4
44
UBUNTU_VERSION=24.04
55
AMARISOFT_VERSION=2023-09-08
66
SRSUE_VERSION=23.11

tests/e2e/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ markers = [
3737
"zmq_4x4_mimo",
3838
"zmq_srsue",
3939
"test_mode",
40+
"test_mode_not_crash",
4041
"viavi",
4142
"viavi_manual",
4243
]

tests/e2e/tests/test_mode.py

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,41 @@ def test_ue(
128128

129129

130130
@mark.test_mode
131-
# pylint: disable=too-many-arguments
132131
def test_ru(
133132
# Retina
134133
retina_manager: RetinaTestManager,
135134
retina_data: RetinaTestData,
136135
# Clients
137136
gnb: GNBStub,
137+
):
138+
"""
139+
Run gnb in test mode ru dummy.
140+
"""
141+
_test_ru(retina_manager, retina_data, gnb)
142+
143+
144+
@mark.test_mode_not_crash
145+
def test_ru_not_crash(
146+
# Retina
147+
retina_manager: RetinaTestManager,
148+
retina_data: RetinaTestData,
149+
# Clients
150+
gnb: GNBStub,
151+
):
152+
"""
153+
Run gnb with sanitizers in test mode ru dummy.
154+
It ignores warnings and KOs, so it will fail if the gnb+sanitizer fails
155+
"""
156+
_test_ru(retina_manager, retina_data, gnb, warning_as_errors=False, fail_if_kos=True)
157+
158+
159+
# pylint: disable=too-many-arguments
160+
def _test_ru(
161+
# Retina
162+
retina_manager: RetinaTestManager,
163+
retina_data: RetinaTestData,
164+
# Clients
165+
gnb: GNBStub,
138166
# Test
139167
nof_ant: int = 4,
140168
duration: int = 5 * 60,
@@ -146,10 +174,6 @@ def test_ru(
146174
warning_as_errors: bool = True,
147175
fail_if_kos: bool = True,
148176
): # pylint: disable=too-many-locals
149-
"""
150-
Run gnb in test mode.
151-
"""
152-
153177
# Configuration
154178
with tempfile.NamedTemporaryFile(mode="w+") as tmp_file:
155179
tmp_file.write(" ") # Make it not empty to overwrite default one

0 commit comments

Comments
 (0)