Skip to content

O
openairinterface-6g
Commit 77335985 authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova
Browse files
Options

Merge remote-tracking branch 'origin/ci-iperf3-fix' into integration_2025_w44 (!3731) 

CI: ensure clean iperf3 server startup

- Resolves issue with iperf3 test failure in RFSim5G multiue test
- Minor fix of iperf3 test descriptions in RFSim5G pipeline
parents 314ddceb 9be94881
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 16 deletions
ci-scripts/cls_oaicitest.py
View file @ 77335985
...@@ -503,6 +503,11 @@ class OaiCiTest(): ...@@ -503,6 +503,11 @@ class OaiCiTest():
t = iperf_time * 2.5 t = iperf_time * 2.5
cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True) cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
if cn.runIperf3Server(): if cn.runIperf3Server():
# Clean up any existing iperf3 server processes on this port.
ret = cmd_svr.run(f"{cn.getCmdPrefix()} pkill -f '.*iperf3.*{port}'", reportNonZero=False)
# If pkill succeeds, it means there was a leftover iperf3 server.
if ret.returncode == 0:
logging.warning(f'Iperf3 server on port {port} detected and terminated')
cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t) cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t) cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
dest_filename = archiveArtifact(cmd_ue, ctx, client_filename) dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
......
ci-scripts/xml_files/container_5g_f1_rfsim.xml
View file @ 77335985
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<testCase id="030021"> <testCase id="030021">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc> <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20 -R</iperf_args> <iperf_args>-u -b 3M -t 20 -R</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<testCase id="030022"> <testCase id="030022">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc> <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20</iperf_args> <iperf_args>-u -b 3M -t 20</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
ci-scripts/xml_files/container_5g_rfsim.xml
View file @ 77335985
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<testCase id="030001"> <testCase id="030001">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc> <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20 -R</iperf_args> <iperf_args>-u -b 3M -t 20 -R</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<testCase id="030002"> <testCase id="030002">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc> <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 1M -t 20</iperf_args> <iperf_args>-u -b 1M -t 20</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
ci-scripts/xml_files/container_5g_rfsim_24prb.xml
View file @ 77335985
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<testCase id="030001"> <testCase id="030001">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc> <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20 -R</iperf_args> <iperf_args>-u -b 3M -t 20 -R</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<testCase id="030002"> <testCase id="030002">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc> <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 1M -t 20</iperf_args> <iperf_args>-u -b 1M -t 20</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
ci-scripts/xml_files/container_5g_rfsim_2x2.xml
View file @ 77335985
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<testCase id="030001"> <testCase id="030001">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc> <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 10M -t 20 -R</iperf_args> <iperf_args>-u -b 10M -t 20 -R</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<testCase id="030002"> <testCase id="030002">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/3Mbps/UDP)(30 sec)</desc> <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20</iperf_args> <iperf_args>-u -b 3M -t 20</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
View file @ 77335985
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<testCase id="030011"> <testCase id="030011">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/30kbps/UDP)(30 sec)</desc> <desc>Iperf (DL/30kbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args> <iperf_args>-u -b 0.03M -t 20 -R -c 10.0.1.1</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<testCase id="030012"> <testCase id="030012">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/30kbps/UDP)(30 sec)</desc> <desc>Iperf (UL/30kbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args> <iperf_args>-u -b 0.03M -t 20 -c 10.0.1.1</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
ci-scripts/xml_files/container_5g_rfsim_multiue.xml
View file @ 77335985
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<testCase id="030001"> <testCase id="030001">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc> <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20 -R</iperf_args> <iperf_args>-u -b 3M -t 20 -R</iperf_args>
<id>rfsim5g_multiue1</id> <id>rfsim5g_multiue1</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<testCase id="030002"> <testCase id="030002">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc> <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 1M -t 20</iperf_args> <iperf_args>-u -b 1M -t 20</iperf_args>
<id>rfsim5g_multiue1</id> <id>rfsim5g_multiue1</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml
View file @ 77335985
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<testCase id="030001"> <testCase id="030001">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/10Mbps/UDP)(30 sec)</desc> <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20 -R</iperf_args> <iperf_args>-u -b 3M -t 20 -R</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<testCase id="030002"> <testCase id="030002">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/4Mbps/UDP)(30 sec)</desc> <desc>Iperf (UL/4Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 1M -t 20</iperf_args> <iperf_args>-u -b 1M -t 20</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
View file @ 77335985
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<testCase id="030001"> <testCase id="030001">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (DL/3Mbps/UDP)(30 sec)</desc> <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 3M -t 20 -R</iperf_args> <iperf_args>-u -b 3M -t 20 -R</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<testCase id="030002"> <testCase id="030002">
<class>Iperf</class> <class>Iperf</class>
<desc>Iperf (UL/1Mbps/UDP)(30 sec)</desc> <desc>Iperf (UL/1Mbps/UDP)(20 sec)</desc>
<iperf_args>-u -b 1M -t 20</iperf_args> <iperf_args>-u -b 1M -t 20</iperf_args>
<id>rfsim5g_ue</id> <id>rfsim5g_ue</id>
<nodes>localhost</nodes> <nodes>localhost</nodes>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment