From bbfd3c6174a9f03d2f7a1dea44e62a02f6596621 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Fri, 22 Nov 2024 16:13:26 +0100 Subject: [PATCH 1/2] CI: use OC CN in aerial pipeline Replace current docker deployment of OAI CN by deployment on OC. With change of the CN, we also need to change the routing for UE module - change the mbim script for controling the UE. --- ci-scripts/ci_infra.yaml | 11 ++++++++-- .../gnb-vnf.sa.band78.273prb.aerial.conf | 2 +- .../xml_files/container_sa_aerial_quectel.xml | 21 +++++++++++++++---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml index cf6e0cad11..d651f2723c 100644 --- a/ci-scripts/ci_infra.yaml +++ b/ci-scripts/ci_infra.yaml @@ -28,8 +28,8 @@ up2-fhi72: up2-aerial: Host: up2 - AttachScript: sudo /opt/mbim-aerial/start_quectel_mbim.sh - DetachScript: sudo /opt/mbim-aerial/stop_quectel_mbim.sh + AttachScript: sudo /opt/mbim-fhi72/start_quectel_mbim.sh + DetachScript: sudo /opt/mbim-fhi72/stop_quectel_mbim.sh NetworkScript: ip a show dev wwan0 IF: wwan0 MTU: 1500 @@ -75,6 +75,13 @@ oc-cn5g-20897: NetworkScript: echo "inet 172.21.6.105" RunIperf3Server: False +oc-cn5g-20897-aerial2: + Host: aerial2 + Namespace: "oaicicd-core-for-fhi72" + CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897" + NetworkScript: echo "inet 172.21.6.105" + RunIperf3Server: False + matix-cn5g: Host: matix NetworkScript: docker exec prod-trf-gen ip a show dev eth0 diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf index c035882d36..a38355ecea 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf @@ -188,7 +188,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ({ ipv4 = "192.168.71.132"; }); + amf_ip_address = ({ ipv4 = "172.21.6.103"; }); NETWORK_INTERFACES : diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml index 63f22af51d..1b56111dd6 100644 --- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml +++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml @@ -25,6 +25,7 @@ AERIAL 100 MHz TDD SA tasks + 555000 111111 000222 800813 @@ -37,8 +38,14 @@ 000222 222222 333333 + 000555 + + Initialize_5GCN + Initialize 5G Core + oc-cn5g-20897-aerial2 + Pull_Local_Registry @@ -82,15 +89,15 @@ Ping Ping: 100pings in 20sec up2-aerial - -c 100 -i 0.2 %cn_ip% + -c 100 -i 0.2 172.21.6.104 5 Iperf - iperf (DL/UDP/700M)(30 sec)(single-ue profile) + iperf (DL/UDP/600M)(30 sec)(single-ue profile) -u -b 600M -t 30 -R - porcepix-cn5g + oc-cn5g-20897-aerial2 up2-aerial 25 80 @@ -100,7 +107,7 @@ Iperf iperf (UL/UDP/50M)(30 sec)(single-ue profile) -u -b 50M -t 30 - porcepix-cn5g + oc-cn5g-20897-aerial2 up2-aerial 25 80 @@ -131,5 +138,11 @@ 0 + + Terminate_5GCN + true + Terminate 5G Core + oc-cn5g-20897-aerial2 + From dbc8fd4956cbfb2fd045a2b8d47b12c8ec3002aa Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Mon, 25 Nov 2024 18:03:32 +0100 Subject: [PATCH 2/2] CI: increase timeout for OC CN deployment Occasionally, the CN deployment takes longer than 60 seconds to complete successfully. As a result, the CI reports failure, even when all other test stages pass (e.g., gNB attaches to the CN, UE connects, and iperf tests succeed). --- ci-scripts/cls_cluster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 503529d256..4b5f6807c3 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -73,7 +73,7 @@ def OC_deploy_CN(cmd, ocUserName, ocPassword, ocNamespace, path): if not succeeded: return False, CONST.OC_LOGIN_FAIL cmd.run('helm uninstall oai5gcn --wait --timeout 60s') - ret = cmd.run(f'helm install --wait --timeout 60s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.') + ret = cmd.run(f'helm install --wait --timeout 120s oai5gcn {path}/ci-scripts/charts/oai-5g-basic/.') if ret.returncode != 0: logging.error('OC OAI CN5G: Deployment failed') OC_logout(cmd)