Skip to content

Commit 2619516

Browse files
author
qarlosalberto
committed
ci: fix viavi tests
1 parent 364b8f4 commit 2619516

File tree

3 files changed

+36
-30
lines changed

3 files changed

+36
-30
lines changed

‎.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.49.5
3+
RETINA_VERSION=0.49.6
44
UBUNTU_VERSION=24.04
55
AMARISOFT_VERSION=2023-09-08
66
SRSUE_VERSION=23.11

‎tests/e2e/tests/viavi.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,13 +412,13 @@ def check_metrics_criteria(
412412
kpis: KPIs = get_kpis(gnb, viavi_failure_manager=viavi_failure_manager, metrics_summary=metrics_summary)
413413

414414
is_ok &= check_and_print_criteria(
415-
"DL bitrate", kpis.dl_brate_aggregate, test_configuration.expected_dl_bitrate, operator.gt
415+
"DL bitrate", kpis.dl_brate_aggregate, test_configuration.expected_dl_bitrate, operator.gt, False
416416
)
417417
is_ok &= check_and_print_criteria(
418-
"UL bitrate", kpis.ul_brate_aggregate, test_configuration.expected_ul_bitrate, operator.gt
418+
"UL bitrate", kpis.ul_brate_aggregate, test_configuration.expected_ul_bitrate, operator.gt, False
419419
)
420420
is_ok &= (
421-
check_and_print_criteria("Number of KOs and/or retrxs", kpis.nof_ko_aggregate, 0, operator.eq)
421+
check_and_print_criteria("Number of KOs and/or retrxs", kpis.nof_ko_aggregate, 0, operator.eq, not fail_if_kos)
422422
or not fail_if_kos
423423
)
424424

@@ -431,13 +431,19 @@ def check_metrics_criteria(
431431

432432

433433
def check_and_print_criteria(
434-
name: str, current: float, expected: float, operator_method: Callable[[float, float], bool]
434+
name: str,
435+
current: float,
436+
expected: float,
437+
operator_method: Callable[[float, float], bool],
438+
force_log_info: bool = False,
435439
) -> bool:
436440
"""
437441
Check and print criteria
438442
"""
439443
is_ok = operator_method(current, expected)
440-
(logging.info if is_ok else logging.error)(f"{name} expected: {expected}, actual: {current}")
444+
(logging.info if is_ok or force_log_info else logging.error)(
445+
f"{name} expected: {expected:.2e}, actual: {current:.2e}"
446+
)
441447
return is_ok
442448

443449

‎tests/e2e/tests/viavi/test_declaration.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
# warning_as_errors: treat warnings as errors
2121

2222
campaign_filename: &campaign_filename "C:\\ci\\CI 4x4 ORAN-FH-complete.xml"
23-
gnb_extra_commands: &gnb_extra_commands ""
24-
expected_dl_bitrate_high: &expected_dl_bitrate_high 1000000
25-
expected_ul_bitrate_high: &expected_ul_bitrate_high 1000000
26-
expected_dl_bitrate_low: &expected_dl_bitrate_low 1000
23+
gnb_extra_commands: &gnb_extra_commands "log --mac_level=info"
24+
expected_dl_bitrate_high: &expected_dl_bitrate_high 1400000000
25+
expected_ul_bitrate_high: &expected_ul_bitrate_high 100000000
26+
expected_dl_bitrate_low: &expected_dl_bitrate_low 14000
2727
expected_ul_bitrate_low: &expected_ul_bitrate_low 1000
2828

2929
tests:
@@ -64,8 +64,8 @@ tests:
6464
max_puschs_per_slot: 8
6565
enable_qos_viavi: false
6666
# test/fail criteria
67-
expected_dl_bitrate: *expected_dl_bitrate_high
68-
expected_ul_bitrate: *expected_ul_bitrate_high
67+
expected_dl_bitrate: *expected_dl_bitrate_low
68+
expected_ul_bitrate: *expected_ul_bitrate_low
6969
fail_if_kos: false
7070
warning_as_errors: true
7171

@@ -78,8 +78,8 @@ tests:
7878
max_puschs_per_slot: 8
7979
enable_qos_viavi: false
8080
# test/fail criteria
81-
expected_dl_bitrate: *expected_dl_bitrate_high
82-
expected_ul_bitrate: *expected_ul_bitrate_high
81+
expected_dl_bitrate: *expected_dl_bitrate_low
82+
expected_ul_bitrate: *expected_ul_bitrate_low
8383
fail_if_kos: false
8484
warning_as_errors: true
8585

@@ -92,8 +92,8 @@ tests:
9292
max_puschs_per_slot: 8
9393
enable_qos_viavi: false
9494
# test/fail criteria
95-
expected_dl_bitrate: *expected_dl_bitrate_high
96-
expected_ul_bitrate: *expected_ul_bitrate_high
95+
expected_dl_bitrate: *expected_dl_bitrate_low
96+
expected_ul_bitrate: *expected_ul_bitrate_low
9797
fail_if_kos: true
9898
warning_as_errors: true
9999

@@ -106,8 +106,8 @@ tests:
106106
max_puschs_per_slot: 1
107107
enable_qos_viavi: false
108108
# test/fail criteria
109-
expected_dl_bitrate: *expected_dl_bitrate_high
110-
expected_ul_bitrate: *expected_ul_bitrate_high
109+
expected_dl_bitrate: *expected_dl_bitrate_low
110+
expected_ul_bitrate: *expected_ul_bitrate_low
111111
fail_if_kos: true
112112
warning_as_errors: true
113113

@@ -120,8 +120,8 @@ tests:
120120
max_puschs_per_slot: 8
121121
enable_qos_viavi: false
122122
# test/fail criteria
123-
expected_dl_bitrate: *expected_dl_bitrate_high
124-
expected_ul_bitrate: *expected_ul_bitrate_high
123+
expected_dl_bitrate: *expected_dl_bitrate_low
124+
expected_ul_bitrate: *expected_ul_bitrate_low
125125
fail_if_kos: false
126126
warning_as_errors: true
127127

@@ -134,8 +134,8 @@ tests:
134134
max_puschs_per_slot: 1
135135
enable_qos_viavi: false
136136
# test/fail criteria
137-
expected_dl_bitrate: *expected_dl_bitrate_high
138-
expected_ul_bitrate: *expected_ul_bitrate_high
137+
expected_dl_bitrate: *expected_dl_bitrate_low
138+
expected_ul_bitrate: *expected_ul_bitrate_low
139139
fail_if_kos: false
140140
warning_as_errors: true
141141

@@ -148,8 +148,8 @@ tests:
148148
max_puschs_per_slot: 1
149149
enable_qos_viavi: false
150150
# test/fail criteria
151-
expected_dl_bitrate: *expected_dl_bitrate_high
152-
expected_ul_bitrate: *expected_ul_bitrate_high
151+
expected_dl_bitrate: *expected_dl_bitrate_low
152+
expected_ul_bitrate: *expected_ul_bitrate_low
153153
fail_if_kos: true
154154
warning_as_errors: true
155155

@@ -162,8 +162,8 @@ tests:
162162
max_puschs_per_slot: 1
163163
enable_qos_viavi: false
164164
# test/fail criteria
165-
expected_dl_bitrate: *expected_dl_bitrate_high
166-
expected_ul_bitrate: *expected_ul_bitrate_high
165+
expected_dl_bitrate: *expected_dl_bitrate_low
166+
expected_ul_bitrate: *expected_ul_bitrate_low
167167
fail_if_kos: false
168168
warning_as_errors: false
169169

@@ -176,8 +176,8 @@ tests:
176176
max_puschs_per_slot: 8
177177
enable_qos_viavi: false
178178
# test/fail criteria
179-
expected_dl_bitrate: *expected_dl_bitrate_high
180-
expected_ul_bitrate: *expected_ul_bitrate_high
179+
expected_dl_bitrate: *expected_dl_bitrate_low
180+
expected_ul_bitrate: *expected_ul_bitrate_low
181181
fail_if_kos: false
182182
warning_as_errors: true
183183

@@ -190,8 +190,8 @@ tests:
190190
max_puschs_per_slot: 1
191191
enable_qos_viavi: false
192192
# test/fail criteria
193-
expected_dl_bitrate: *expected_dl_bitrate_high
194-
expected_ul_bitrate: *expected_ul_bitrate_high
193+
expected_dl_bitrate: *expected_dl_bitrate_low
194+
expected_ul_bitrate: *expected_ul_bitrate_low
195195
fail_if_kos: false
196196
warning_as_errors: true
197197

0 commit comments

Comments
 (0)