maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ci-may-fail' into integration_2025_w25 (!3482)

Browse Source 
CI: Add "may_fail" step to execute flaky steps

Add a generic may_fail CI XML step option that indicates the CI step may
fail, but the CI would still be marked as succeeded (instead of skipping
all steps and mark as failed). The cause of this failure depends on the
specific step, e.g., Iperf failing because of low throughput. This
allows to clean up some code and e.g. remove the command_fail option of
Custom_Command, which is then superfluous (and less generic). An
inconvenience is that those may_fail steps will be marked as "failed" in
the HTML. Later cleanup can correct this.

The may_fail is used for executing FHI7.2 testing to push 700 Mbps in DL
(close to the maximum).

Fix some bugs and add some clean up, see commit messages.
This commit is contained in:
Robert Schmidt
2025-06-19 08:26:33 +02:00
parent f5a07f17f1 7fb44bdb86
commit 1750d4052f
18 changed files with 57 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_oai_html.py
-1
View File
@@ -224,7 +224,6 @@ class HTMLManagement():
self.htmlFile.write(' </table>\n') self.htmlFile.write(' </table>\n')
self.htmlFile.write(' </div>\n') self.htmlFile.write(' </div>\n')
self.htmlFile.close() self.htmlFile.close()
time.sleep(1)
if passStatus: if passStatus:
cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html" cmd = "sed -i -e 's/__STATE_" + self.htmlTabNames[0] + "__//' test_results.html"
subprocess.run(cmd, shell=True) subprocess.run(cmd, shell=True)
ci-scripts/cls_oaicitest.py
+4 -10
View File
@@ -213,7 +213,7 @@ def Iperf_analyzeV2UDP(server_filename, iperf_bitrate_threshold, iperf_packetlos
pal_msg += f' (too high! >{iperf_packetloss_threshold}%)' pal_msg += f' (too high! >{iperf_packetloss_threshold}%)'
return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}') return (result, f'{req_msg}\n{bir_msg}\n{brl_msg}\n{jit_msg}\n{pal_msg}')
def Custom_Command(HTML, node, command, command_fail): def Custom_Command(HTML, node, command):
logging.info(f"Executing custom command on {node}") logging.info(f"Executing custom command on {node}")
cmd = cls_cmd.getConnection(node) cmd = cls_cmd.getConnection(node)
ret = cmd.run(command) ret = cmd.run(command)
@@ -221,26 +221,20 @@ def Custom_Command(HTML, node, command, command_fail):
logging.debug(f"Custom_Command: {command} on node: {node} - {'OK, command succeeded' if ret.returncode == 0 else f'Error, return code: {ret.returncode}'}") logging.debug(f"Custom_Command: {command} on node: {node} - {'OK, command succeeded' if ret.returncode == 0 else f'Error, return code: {ret.returncode}'}")
status = 'OK' status = 'OK'
message = [] message = []
if ret.returncode != 0 and not command_fail: if ret.returncode != 0:
message = [ret.stdout]
logging.warning(f'Custom_Command output: {message}')
status = 'Warning'
if ret.returncode != 0 and command_fail:
message = [ret.stdout] message = [ret.stdout]
logging.error(f'Custom_Command failed: output: {message}') logging.error(f'Custom_Command failed: output: {message}')
status = 'KO' status = 'KO'
HTML.CreateHtmlTestRowQueue(command, status, message) HTML.CreateHtmlTestRowQueue(command, status, message)
return status == 'OK' or status == 'Warning' return status == 'OK' or status == 'Warning'
def Custom_Script(HTML, node, script, command_fail): def Custom_Script(HTML, node, script):
logging.info(f"Executing custom script on {node}") logging.info(f"Executing custom script on {node}")
ret = cls_cmd.runScript(node, script, 90) ret = cls_cmd.runScript(node, script, 90)
logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}") logging.debug(f"Custom_Script: {script} on node: {node} - return code {ret.returncode}, output:\n{ret.stdout}")
status = 'OK' status = 'OK'
message = [ret.stdout] message = [ret.stdout]
if ret.returncode != 0 and not command_fail: if ret.returncode != 0:
status = 'Warning'
if ret.returncode != 0 and command_fail:
status = 'KO' status = 'KO'
HTML.CreateHtmlTestRowQueue(script, status, message) HTML.CreateHtmlTestRowQueue(script, status, message)
return status == 'OK' or status == 'Warning' return status == 'OK' or status == 'Warning'
ci-scripts/main.py
+6 -5
View File
@@ -376,14 +376,12 @@ def ExecuteActionWithParam(action):
# Change all execution targets to localhost # Change all execution targets to localhost
node = 'localhost' node = 'localhost'
command = test.findtext('command') command = test.findtext('command')
command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes'] success = cls_oaicitest.Custom_Command(HTML, node, command)
success = cls_oaicitest.Custom_Command(HTML, node, command, command_fail)
elif action == 'Custom_Script': elif action == 'Custom_Script':
node = test.findtext('node') node = test.findtext('node')
script = test.findtext('script') script = test.findtext('script')
command_fail = test.findtext('command_fail') in ['True', 'true', 'Yes', 'yes'] success = cls_oaicitest.Custom_Script(HTML, node, script)
success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)
elif action == 'Pull_Cluster_Image': elif action == 'Pull_Cluster_Image':
tag_prefix = test.findtext('tag_prefix') or "" tag_prefix = test.findtext('tag_prefix') or ""
@@ -626,6 +624,7 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
HTML.testCase_id=CiTestObj.testCase_id HTML.testCase_id=CiTestObj.testCase_id
CiTestObj.desc = test.findtext('desc') CiTestObj.desc = test.findtext('desc')
always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes'] always_exec = test.findtext('always_exec') in ['True', 'true', 'Yes', 'yes']
may_fail = test.findtext('may_fail') in ['True', 'true', 'Yes', 'yes']
HTML.desc=CiTestObj.desc HTML.desc=CiTestObj.desc
action = test.findtext('class') action = test.findtext('class')
if (CheckClassValidity(xml_class_list, action, id) == False): if (CheckClassValidity(xml_class_list, action, id) == False):
@@ -639,7 +638,9 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
break break
try: try:
test_succeeded = ExecuteActionWithParam(action) test_succeeded = ExecuteActionWithParam(action)
if not test_succeeded: if not test_succeeded and may_fail:
logging.warning(f"test ID {test_case_id} action {action} may or may not fail, proceeding despite error")
elif not test_succeeded:
logging.error(f"test ID {test_case_id} action {action} failed ({test_succeeded}), skipping next tests") logging.error(f"test ID {test_case_id} action {action} failed ({test_succeeded}), skipping next tests")
task_set_succeeded = False task_set_succeeded = False
except Exception as e: except Exception as e:
ci-scripts/ran.py
-1
View File
@@ -95,7 +95,6 @@ class RANManagement():
self.cmd_prefix = '' # prefix before {lte,nr}-softmodem self.cmd_prefix = '' # prefix before {lte,nr}-softmodem
self.node = '' self.node = ''
self.command = '' self.command = ''
self.command_fail = False
#----------------------------------------------------------- #-----------------------------------------------------------
ci-scripts/tests/test-runner/test.xml
+17 -4
View File
@@ -27,6 +27,8 @@
<htmlTabIcon>wrench</htmlTabIcon> <htmlTabIcon>wrench</htmlTabIcon>
<TestCaseRequestedList> <TestCaseRequestedList>
000001 000001
000011
000012
000002 000002
000003 000003
000004 000004
@@ -38,7 +40,21 @@
<desc>This should succeed</desc> <desc>This should succeed</desc>
<node>localhost</node> <node>localhost</node>
<command>true</command> <command>true</command>
<command_fail>yes</command_fail> </testCase>
<testCase id="000011">
<class>Custom_Command</class>
<desc>This may fail</desc>
<may_fail>true</may_fail>
<node>localhost</node>
<command>false</command>
</testCase>
<testCase id="000012">
<class>Custom_Command</class>
<desc>This is still executed</desc>
<node>localhost</node>
<command>true</command>
</testCase> </testCase>
<testCase id="000002"> <testCase id="000002">
@@ -46,7 +62,6 @@
<desc>This should fail</desc> <desc>This should fail</desc>
<node>localhost</node> <node>localhost</node>
<command>false</command> <command>false</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="000003"> <testCase id="000003">
@@ -54,7 +69,6 @@
<desc>This should be skipped</desc> <desc>This should be skipped</desc>
<node>localhost</node> <node>localhost</node>
<command>true</command> <command>true</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="000004"> <testCase id="000004">
@@ -63,6 +77,5 @@
<always_exec>true</always_exec> <always_exec>true</always_exec>
<node>localhost</node> <node>localhost</node>
<command>true</command> <command>true</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
</testCaseList> </testCaseList>
ci-scripts/xml_files/container_5g_f1_rfsim.xml
-10
View File
@@ -134,7 +134,6 @@
<desc>Simulate a DL radio channel with noise (3 dB)</desc> <desc>Simulate a DL radio channel with noise (3 dB)</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo channelmod modify 0 noise_power_dB 3 | nc --send-only 192.168.71.181 8091</command> <command>echo channelmod modify 0 noise_power_dB 3 | nc --send-only 192.168.71.181 8091</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="030021"> <testCase id="030021">
@@ -166,7 +165,6 @@
<desc>Trigger Reestablishment</desc> <desc>Trigger Reestablishment</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ci force_reestab | nc 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command> <command>echo ci force_reestab | nc 192.168.71.171 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="020022"> <testCase id="020022">
@@ -185,7 +183,6 @@
<desc>Verify Reestablishment</desc> <desc>Verify Reestablishment</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ci get_reestab_count | nc 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command> <command>echo ci get_reestab_count | nc 192.168.71.150 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040021"> <testCase id="040021">
@@ -193,7 +190,6 @@
<desc>Simulate a disruption of DL radio channel (ploss 55)</desc> <desc>Simulate a disruption of DL radio channel (ploss 55)</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo channelmod modify 0 ploss 55 | nc 192.168.71.181 8091</command> <command>echo channelmod modify 0 ploss 55 | nc 192.168.71.181 8091</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040022"> <testCase id="040022">
@@ -201,7 +197,6 @@
<desc>Get UE sync state (UE ID 0)</desc> <desc>Get UE sync state (UE ID 0)</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command> <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_NOT_SYNC</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040023"> <testCase id="040023">
@@ -209,7 +204,6 @@
<desc>Restoration of the original DL channel conditions (ploss 20)</desc> <desc>Restoration of the original DL channel conditions (ploss 20)</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo channelmod modify 0 ploss 20 | nc 192.168.71.181 8091</command> <command>echo channelmod modify 0 ploss 20 | nc 192.168.71.181 8091</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040024"> <testCase id="040024">
@@ -217,7 +211,6 @@
<desc>Get UE sync state (UE ID 0)</desc> <desc>Get UE sync state (UE ID 0)</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_CONNECTED</command> <command>echo ciUE sync_state 0 | nc 192.168.71.181 8091 | grep -E UE_CONNECTED</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040025"> <testCase id="040025">
@@ -225,7 +218,6 @@
<desc>Trigger Handover</desc> <desc>Trigger Handover</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ci trigger_f1_ho | nc 192.168.71.150 9090</command> <command>echo ci trigger_f1_ho | nc 192.168.71.150 9090</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040026"> <testCase id="040026">
@@ -233,7 +225,6 @@
<desc>UE (1) connected to DU-PCI 0?</desc> <desc>UE (1) connected to DU-PCI 0?</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3584"</command> <command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3584"</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040027"> <testCase id="040027">
@@ -241,7 +232,6 @@
<desc>UE (1) connected to DU-PCI 1?</desc> <desc>UE (1) connected to DU-PCI 1?</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3585"</command> <command>echo ci fetch_du_by_ue_id 1 | nc 192.168.71.150 9090 | grep "3585"</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="100021"> <testCase id="100021">
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
-2
View File
@@ -151,7 +151,6 @@
<desc>Force Msg3 C-RNTI RA</desc> <desc>Force Msg3 C-RNTI RA</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ciUE force_crnti_ra | nc 192.168.71.150 8091</command> <command>echo ciUE force_crnti_ra | nc 192.168.71.150 8091</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="040002"> <testCase id="040002">
@@ -159,7 +158,6 @@
<desc>Force RRC_IDLE (UE ID 0)</desc> <desc>Force RRC_IDLE (UE ID 0)</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>echo ciUE force_RRC_IDLE | nc 192.168.71.150 8091</command> <command>echo ciUE force_RRC_IDLE | nc 192.168.71.150 8091</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="100001"> <testCase id="100001">
ci-scripts/xml_files/container_5g_rfsim_sidelink.xml
-1
View File
@@ -79,7 +79,6 @@
<desc>Check that UE synched</desc> <desc>Check that UE synched</desc>
<node>cacofonix</node> <node>cacofonix</node>
<command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command> <command>docker logs rfsim5g-oai-nr-ue-2 | grep -m 1 "PSBCH RX:OK"</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="100001"> <testCase id="100001">
ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
-8
View File
@@ -108,14 +108,6 @@
<eNB_serverId>0</eNB_serverId> <eNB_serverId>0</eNB_serverId>
</testCase> </testCase>
<testCase id="004000">
<class>Custom_Command</class>
<always_exec>true</always_exec>
<desc>Clean-Up any residual volume</desc>
<node>cacofonix</node>
<command>docker volume rm 5g_rfsimulator_tdd_dora_rrc.config</command>
</testCase>
<testCase id="222222"> <testCase id="222222">
<class>Clean_Test_Server_Images</class> <class>Clean_Test_Server_Images</class>
<always_exec>true</always_exec> <always_exec>true</always_exec>
ci-scripts/xml_files/container_nsa_b200_quectel.xml
+2 -2
View File
@@ -70,9 +70,9 @@
<testCase id = "100000"> <testCase id = "100000">
<class>Custom_Command</class> <class>Custom_Command</class>
<desc>Reset USRP</desc> <desc>Reset USRP on nepes</desc>
<node>nepes</node> <node>nepes</node>
<command>sudo -S /usr/lib/uhd/utils/b2xx_fx3_utils --reset-device</command> <command>sudo -S /usr/local/lib/uhd/utils/b2xx_fx3_utils --reset-device</command>
</testCase> </testCase>
<testCase id="200000"> <testCase id="200000">
ci-scripts/xml_files/container_sa_aw2s_asue.xml
+4 -4
View File
@@ -182,7 +182,7 @@
<testCase id="100010"> <testCase id="100010">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/3Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/3Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 45M -t 30 -R</iperf_args> <iperf_args>-u -b 45M -t 30 -R</iperf_args>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
<iperf_packetloss_threshold>25</iperf_packetloss_threshold> <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -193,7 +193,7 @@
<testCase id="100030"> <testCase id="100030">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -R</iperf_args> <iperf_args>-t 30 -R</iperf_args>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
<iperf_tcp_rate_target>2</iperf_tcp_rate_target> <iperf_tcp_rate_target>2</iperf_tcp_rate_target>
@@ -202,7 +202,7 @@
<testCase id="100020"> <testCase id="100020">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/1Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/1Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 15M -t 30</iperf_args> <iperf_args>-u -b 15M -t 30</iperf_args>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
<iperf_packetloss_threshold>25</iperf_packetloss_threshold> <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -213,7 +213,7 @@
<testCase id="100040"> <testCase id="100040">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/TCP)(30 sec)</desc>
<iperf_args>-t 30</iperf_args> <iperf_args>-t 30</iperf_args>
<svr_id>oc-cn5g</svr_id> <svr_id>oc-cn5g</svr_id>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml
+4 -4
View File
@@ -179,7 +179,7 @@
<testCase id="000010"> <testCase id="000010">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/4Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/4Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 60M -t 30 -R</iperf_args> <iperf_args>-u -b 60M -t 30 -R</iperf_args>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
<iperf_packetloss_threshold>25</iperf_packetloss_threshold> <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -190,7 +190,7 @@
<testCase id="000030"> <testCase id="000030">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -R</iperf_args> <iperf_args>-t 30 -R</iperf_args>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
<iperf_tcp_rate_target>3.9</iperf_tcp_rate_target> <iperf_tcp_rate_target>3.9</iperf_tcp_rate_target>
@@ -199,7 +199,7 @@
<testCase id="000020"> <testCase id="000020">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/1.5Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/1.5Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 22.5M -t 30</iperf_args> <iperf_args>-u -b 22.5M -t 30</iperf_args>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
<iperf_packetloss_threshold>25</iperf_packetloss_threshold> <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
@@ -210,7 +210,7 @@
<testCase id="000040"> <testCase id="000040">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/TCP)(30 sec)</desc>
<iperf_args>-t 30</iperf_args> <iperf_args>-t 30</iperf_args>
<svr_id>oc-cn5g</svr_id> <svr_id>oc-cn5g</svr_id>
<id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id> <id>amarisoft_ue_1 amarisoft_ue_2 amarisoft_ue_3 amarisoft_ue_4 amarisoft_ue_5 amarisoft_ue_6 amarisoft_ue_7 amarisoft_ue_8 amarisoft_ue_9 amarisoft_ue_10 amarisoft_ue_11 amarisoft_ue_12 amarisoft_ue_13 amarisoft_ue_14 amarisoft_ue_15</id>
ci-scripts/xml_files/container_sa_b200_quectel.xml
-2
View File
@@ -200,14 +200,12 @@
<desc>Trigger Reestablishment</desc> <desc>Trigger Reestablishment</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command> <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="060002"> <testCase id="060002">
<class>Custom_Command</class> <class>Custom_Command</class>
<desc>Verify Reestablishment</desc> <desc>Verify Reestablishment</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command> <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="030201"> <testCase id="030201">
ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
-2
View File
@@ -188,14 +188,12 @@
<desc>Trigger Reestablishment (on DU)</desc> <desc>Trigger Reestablishment (on DU)</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command> <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="360002"> <testCase id="360002">
<class>Custom_Command</class> <class>Custom_Command</class>
<desc>Verify Reestablishment (on CU)</desc> <desc>Verify Reestablishment (on CU)</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command> <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="100002"> <testCase id="100002">
ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
-2
View File
@@ -233,14 +233,12 @@
<desc>Trigger Reestablishment (on DU)</desc> <desc>Trigger Reestablishment (on DU)</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command> <command>echo ci force_reestab | nc -N 127.0.0.1 9091 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="160002"> <testCase id="160002">
<class>Custom_Command</class> <class>Custom_Command</class>
<desc>Verify Reestablishment (on CU)</desc> <desc>Verify Reestablishment (on CU)</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command> <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="130201"> <testCase id="130201">
ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml
+4 -6
View File
@@ -49,7 +49,6 @@
<desc>Setup sriov and network interfaces Metanoia</desc> <desc>Setup sriov and network interfaces Metanoia</desc>
<node>cacofonix</node> <node>cacofonix</node>
<script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh</script> <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_sriov_metanoia.sh</script>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="110000"> <testCase id="110000">
@@ -92,7 +91,7 @@
<testCase id="100010"> <testCase id="100010">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/570Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/570Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 570M -t 30 -R</iperf_args> <iperf_args>-u -b 570M -t 30 -R</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_packetloss_threshold>20</iperf_packetloss_threshold> <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -103,7 +102,7 @@
<testCase id="100030"> <testCase id="100030">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -R</iperf_args> <iperf_args>-t 30 -R</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_tcp_rate_target>80</iperf_tcp_rate_target> <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
@@ -112,7 +111,7 @@
<testCase id="100020"> <testCase id="100020">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/100Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/100Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 100M -t 30</iperf_args> <iperf_args>-u -b 100M -t 30</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_packetloss_threshold>20</iperf_packetloss_threshold> <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -123,7 +122,7 @@
<testCase id="100040"> <testCase id="100040">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/TCP)(30 sec)</desc>
<iperf_args>-t 30</iperf_args> <iperf_args>-t 30</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_tcp_rate_target>80</iperf_tcp_rate_target> <iperf_tcp_rate_target>80</iperf_tcp_rate_target>
@@ -166,7 +165,6 @@
<desc>Set CPU to idle state, set kernel parameters to default values</desc> <desc>Set CPU to idle state, set kernel parameters to default values</desc>
<node>cacofonix</node> <node>cacofonix</node>
<script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_cleanup.sh</script> <script>yaml_files/sa_fhi_7.2_metanoia_2x2_gnb/setup_cleanup.sh</script>
<command_fail>yes</command_fail>
</testCase> </testCase>
</testCaseList> </testCaseList>
ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
+16 -6
View File
@@ -36,6 +36,7 @@
100020 100020
100030 100030
100040 100040
100011
103000 103000
100002 100002
130000 130000
@@ -49,7 +50,6 @@
<desc>Setup sriov and network interfaces VVDN</desc> <desc>Setup sriov and network interfaces VVDN</desc>
<node>cacofonix</node> <node>cacofonix</node>
<script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_sriov_vvdn.sh</script> <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_sriov_vvdn.sh</script>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="110000"> <testCase id="110000">
@@ -90,7 +90,7 @@
<testCase id="100010"> <testCase id="100010">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/600Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/600Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 600M -t 30 -R</iperf_args> <iperf_args>-u -b 600M -t 30 -R</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_packetloss_threshold>20</iperf_packetloss_threshold> <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -99,9 +99,20 @@
<svr_id>oc-cn5g-20897</svr_id> <svr_id>oc-cn5g-20897</svr_id>
</testCase> </testCase>
<testCase id="100011">
<class>Iperf</class>
<desc>Optional iperf (DL/700Mbps/UDP)(30 sec)</desc>
<may_fail>true</may_fail>
<iperf_args>-u -b 700M -t 30 -R</iperf_args>
<id>up2-fhi72</id>
<iperf_packetloss_threshold>10</iperf_packetloss_threshold>
<iperf_bitrate_threshold>95</iperf_bitrate_threshold>
<svr_id>oc-cn5g-20897</svr_id>
</testCase>
<testCase id="100030"> <testCase id="100030">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (DL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (DL/TCP)(30 sec)</desc>
<iperf_args>-t 30 -R</iperf_args> <iperf_args>-t 30 -R</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_tcp_rate_target>40</iperf_tcp_rate_target> <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
@@ -110,7 +121,7 @@
<testCase id="100020"> <testCase id="100020">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/80Mbps/UDP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/80Mbps/UDP)(30 sec)</desc>
<iperf_args>-u -b 80M -t 30</iperf_args> <iperf_args>-u -b 80M -t 30</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_packetloss_threshold>20</iperf_packetloss_threshold> <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
@@ -121,7 +132,7 @@
<testCase id="100040"> <testCase id="100040">
<class>Iperf</class> <class>Iperf</class>
<desc>iperf (UL/TCP)(30 sec)(multi-ue profile)</desc> <desc>iperf (UL/TCP)(30 sec)</desc>
<iperf_args>-t 30</iperf_args> <iperf_args>-t 30</iperf_args>
<id>up2-fhi72</id> <id>up2-fhi72</id>
<iperf_tcp_rate_target>10</iperf_tcp_rate_target> <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
@@ -164,7 +175,6 @@
<desc>Set CPU to idle state, set kernel parameters to default values</desc> <desc>Set CPU to idle state, set kernel parameters to default values</desc>
<node>cacofonix</node> <node>cacofonix</node>
<script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script> <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script>
<command_fail>yes</command_fail>
</testCase> </testCase>
ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
-2
View File
@@ -194,14 +194,12 @@
<desc>Trigger Reestablishment</desc> <desc>Trigger Reestablishment</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command> <command>echo ci force_reestab | nc -N 127.0.0.1 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="260002"> <testCase id="260002">
<class>Custom_Command</class> <class>Custom_Command</class>
<desc>Verify Reestablishment</desc> <desc>Verify Reestablishment</desc>
<node>ofqot</node> <node>ofqot</node>
<command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command> <command>echo ci get_reestab_count | nc -N 127.0.0.1 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
<command_fail>yes</command_fail>
</testCase> </testCase>
<testCase id="230201"> <testCase id="230201">