diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml index b82c755850..6e62be1d57 100644 --- a/ci-scripts/ci_infra.yaml +++ b/ci-scripts/ci_infra.yaml @@ -79,11 +79,11 @@ oc-cn5g: oc-cn5g-20897: Host: cacofonix - NetworkScript: echo "inet 172.21.6.105" + NetworkScript: echo "inet 172.21.6.115" RunIperf3Server: False - Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72" - Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72" - LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%" + Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72" + Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72" + LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2026-apr oaicicd-core-for-fhi72 %%log_dir%%" oc-cn5g-00103-ho: Host: groot diff --git a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf index 346183a308..2c884ad665 100644 --- a/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf +++ b/ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf @@ -215,6 +215,7 @@ L1s = ( { num_cc = 1; + prach_dtx_threshold = 200; tr_n_preference = "local_mac"; } ); diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf index c06c6ca069..a79e39a6df 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf @@ -186,10 +186,10 @@ MACRLCs = ( local_s_portd = 50011; // vnf p7 port [!] tr_s_preference = "aerial"; tr_n_preference = "local_RRC"; - pucch_RSSI_Threshold = -270; - pusch_RSSI_Threshold = -260; - pusch_TargetSNRx10 = 260; # 150; - pucch_TargetSNRx10 = 200; #200; + pucch_RSSI_Threshold = -270; + pusch_RSSI_Threshold = -260; + pusch_TargetSNRx10 = 290; + pucch_TargetSNRx10 = 200; dl_max_mcs = 28; ul_max_mcs = 28; ul_min_mcs = 9; diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 7e87941f0d..989eb4ca8d 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -161,7 +161,7 @@ gNBs = ////////// AMF parameters: - amf_ip_address = ({ ipv4 = "172.21.6.103"; }); + amf_ip_address = ({ ipv4 = "172.21.6.113"; }); NETWORK_INTERFACES : { diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf index ab5db0581a..56d7b3a1fe 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf @@ -197,7 +197,7 @@ RUs = ( nb_tx = 2; nb_rx = 2; att_tx = 0; - att_rx = 0; + att_rx = 6; bands = [77]; max_pdschReferenceSignalPower = -27; max_rxgain = 71; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf similarity index 99% rename from ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf rename to ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf index df090801d0..d3e3b89820 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf @@ -18,7 +18,7 @@ gNBs = nr_cellid = 12345678L; ////////// Physical parameters: - + use_deltaMCS = 1; servingCellConfigCommon = ( { @@ -180,7 +180,7 @@ MACRLCs = ( { tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; - pusch_TargetSNRx10 = 200; + pusch_TargetSNRx10 = 100; pucch_TargetSNRx10 = 200; ul_prbblack_SNR_threshold = 10; } diff --git a/ci-scripts/scripts/vvdn-activate-carriers.sh b/ci-scripts/scripts/vvdn-activate-carriers.sh new file mode 100755 index 0000000000..528d793e23 --- /dev/null +++ b/ci-scripts/scripts/vvdn-activate-carriers.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# SPDX-License-Identifier: MIT + +set -e + +RU_IP="10.10.0.111" +RU_HOST="root@10.10.0.111" + +ssh_exec() { + ssh $RU_HOST $@ 100) { + print "✗ PTP FLUCTUATION DETECTED → " $0 + exit 0 + } +} +') + +if [ -n "$check_ptp" ]; then + echo "$check_ptp" +else + echo "✓ No PTP fluctuations detected." +fi + +echo "→ Checking if VVDN LPRU is PTP synchronized (timeout 1 min)..." +if ssh_exec 'timeout 1m sh -c "tail -F /var/log/synctimingptp2.log | grep -m 1 -F ,\ synchronized"'; then + echo "✓ VVDN LPRU synchronized" +else + echo "✗ VVDN LPRU not synchronized" +fi + +echo "→ Checking TX/RX carrier configuration..." +if ssh_exec 'sysrepocfg -X -d running -f xml | grep -q "INACTIVE"'; then + echo "→ Some carriers are not active, activating via sysrepocfg..." + ssh_exec 'sysrepocfg -X -d running -f xml | sed "s/INACTIVE<\/active>/ACTIVE<\/active>/g" | sysrepocfg -I -d running -f xml' + echo "✓ All TX/RX carriers activated." +else + echo "✓ All TX/RX carriers already activated." +fi +exit 0 diff --git a/ci-scripts/scripts/vvdn-inactivate-carriers.sh b/ci-scripts/scripts/vvdn-inactivate-carriers.sh new file mode 100755 index 0000000000..4d4eb433c8 --- /dev/null +++ b/ci-scripts/scripts/vvdn-inactivate-carriers.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# SPDX-License-Identifier: MIT + +set -e + +RU_HOST="root@10.10.0.111" + +ssh_exec() { + ssh $RU_HOST $@ gracehopper1-oai ci-scripts/yaml_files/sa_gnb_aerial - oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye + oai-gnb-aerial=EndsWithBye diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml b/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml index 4e64dc551a..77fa13038d 100644 --- a/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml +++ b/ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml @@ -111,7 +111,7 @@ gracehopper1-oai ci-scripts/yaml_files/sa_gnb_aerial_ul - oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye + oai-gnb-aerial=EndsWithBye diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml index 30e04e7c11..6ad482a8dc 100644 --- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml +++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml @@ -12,6 +12,13 @@ + + Custom_Script + Activate carriers on VVDN RU + cacofonix + + + Pull_Local_Registry Pull Images from Local Registry @@ -134,9 +141,9 @@ Custom_Script true - Set CPU to idle state, set kernel parameters to default values + Inactivate carriers on VVDN RU cacofonix - + diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml index a30d6ffad8..76b17218d5 100644 --- a/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml @@ -104,7 +104,7 @@ matix ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz - oai-gnb=RetxCheck=dl=10,100,100,100;ul=25,100,100,100 oai-gnb=EndsWithBye + oai-gnb=EndsWithBye diff --git a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml index b40035a1ef..9135a89f75 100644 --- a/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml @@ -104,7 +104,7 @@ matix ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz - oai-gnb=RetxCheck=dl=15,100,100,100;ul=20,100,100,100 oai-gnb=EndsWithBye + oai-gnb=EndsWithBye diff --git a/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml b/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml index 92456514dc..2a6a28a112 100644 --- a/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml +++ b/ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml @@ -104,7 +104,7 @@ matix ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz - oai-vnf=RetxCheck=10,100,100,100 oai-vnf=EndsWithBye oai-pnf=EndsWithBye + oai-vnf=EndsWithBye oai-pnf=EndsWithBye diff --git a/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh b/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh deleted file mode 100755 index 85a2c0dcab..0000000000 --- a/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -set -e -sudo cpupower idle-set -E > /dev/null -sudo sysctl kernel.sched_rt_runtime_us=950000 -sudo sysctl kernel.timer_migration=1 -exit 0 diff --git a/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml index 6e6f9df848..8b058e3a97 100644 --- a/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_sc_b200_gnb/docker-compose.yml @@ -17,7 +17,7 @@ services: devices: - /dev/bus/usb/:/dev/bus/usb/ volumes: - - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma-deltaMCS.conf:/opt/oai-gnb/etc/gnb.conf # for performance reasons, we use host mode: in bridge mode, we have # unacceptable DL TCP performance. However, the whole point of # containerization is to not be in host mode, so update this to macvlan