From cea02a16b14ca63fe2746657513bea9f3941e630 Mon Sep 17 00:00:00 2001 From: Bartosz Podrygajlo Date: Thu, 20 Feb 2025 16:23:58 +0100 Subject: [PATCH] Modify 5g_fdd_rfsimulator testcase to use shm_radio Use timescale 0.5 to make sure the iperf UL test passes. Also, disable asan as this adds computational complexity that makes the test fail. --- ci-scripts/xml_files/container_5g_fdd_rfsim.xml | 4 ++-- .../5g_fdd_rfsimulator/docker-compose.yaml | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index 276bb5b9a3..1c43120131 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -43,7 +43,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb-asan oai-nr-ue-asan + oai-gnb oai-nr-ue Create_Workspace @@ -134,7 +134,7 @@ true Clean Test Images on Test Server 0 - oai-gnb-asan oai-nr-ue-asan + oai-gnb oai-nr-ue diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index a6103a3815..8c4688262b 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -86,8 +86,7 @@ services: cap_drop: - ALL environment: - USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 + USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.timescale 0.5 depends_on: - oai-ext-dn networks: @@ -95,11 +94,13 @@ services: ipv4_address: 192.168.71.140 volumes: - ../../conf_files/gnb.sa.band66.106prb.rfsim.conf:/opt/oai-gnb/etc/gnb.conf + - tmp_data:/tmp/ healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s timeout: 5s retries: 5 + ipc: host oai-nr-ue: image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop} container_name: rfsim5g-oai-nr-ue @@ -109,7 +110,7 @@ services: - NET_ADMIN # for interface bringup - NET_RAW # for ping environment: - USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --log_config.global_log_options level,nocolor,time --device.name vrtsim depends_on: - oai-gnb networks: @@ -119,11 +120,13 @@ services: - /dev/net/tun:/dev/net/tun volumes: - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf + - tmp_data:/tmp/ healthcheck: test: /bin/bash -c "pgrep nr-uesoftmodem" interval: 10s timeout: 5s retries: 5 + ipc: host networks: public_net: @@ -142,3 +145,6 @@ networks: - subnet: 192.168.72.128/26 driver_opts: com.docker.network.bridge.name: "rfsim5g-traffic" + +volumes: + tmp_data: