diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index b8853917b0..1b1f0aebb1 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -1070,6 +1070,12 @@ class Containerize(): imageNames = ['oai-enb', 'oai-gnb', 'oai-lte-ue', 'oai-nr-ue', 'oai-lte-ru', 'oai-nr-cuup'] for image in imageNames: tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge) + # Maybe we've only pulled sanitized versions of oai-gnb and oai-nr-ue + if image == 'oai-gnb' or image == 'oai-nr-ue': + ret = myCmd.run(f'docker image inspect oai-ci/{tagToUse}', reportNonZero=False) + if ret.returncode != 0: + tagToUse = tagToUse.replace('oai-gnb', 'oai-gnb-asan') + tagToUse = tagToUse.replace('oai-nr-ue', 'oai-nr-ue-asan') cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml' myCmd.run(cmd, silent=self.displayedNewTags) self.displayedNewTags = True @@ -1211,6 +1217,15 @@ class Containerize(): myCmd.run(cmd, silent=self.displayedNewTags) for image in IMAGES: tagToUse = ImageTagToUse(image, self.ranCommitID, self.ranBranch, self.ranAllowMerge) + # Maybe we've only pulled sanitized versions of oai-gnb and oai-nr-ue + if image == 'oai-gnb' or image == 'oai-nr-ue': + ret = myCmd.run(f'docker image inspect oai-ci/{tagToUse}', reportNonZero=False) + if ret.returncode != 0: + tagToUse = tagToUse.replace('oai-gnb', 'oai-gnb-asan') + tagToUse = tagToUse.replace('oai-nr-ue', 'oai-nr-ue-asan') + logging.debug(f'Using sanitized version of {image} with {tagToUse}') + if image == 'oai-gnb-asan' or image == 'oai-nr-ue-asan': + continue cmd = f'sed -i -e "s@oaisoftwarealliance/{image}:develop@oai-ci/{tagToUse}@" docker-compose-ci.yml' myCmd.run(cmd, silent=self.displayedNewTags) self.displayedNewTags = True diff --git a/ci-scripts/xml_files/container_5g_e1_rfsim.xml b/ci-scripts/xml_files/container_5g_e1_rfsim.xml index e37ba4cf96..b89b8a2bd2 100644 --- a/ci-scripts/xml_files/container_5g_e1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_e1_rfsim.xml @@ -43,7 +43,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-cuup oai-nr-ue + oai-gnb-asan oai-nr-cuup-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml index 0f4e0e5487..6f8f71095c 100644 --- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml @@ -42,7 +42,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml index e2d1e3c287..34f5ceec6e 100644 --- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml @@ -44,7 +44,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml index 53a941a518..50ad28e5ca 100644 --- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml +++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml @@ -45,7 +45,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml index 7c755ab184..1c67266f0c 100644 --- a/ci-scripts/xml_files/container_5g_rfsim.xml +++ b/ci-scripts/xml_files/container_5g_rfsim.xml @@ -58,7 +58,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml index f124176209..538122c751 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml @@ -44,7 +44,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml index b178fe0df7..f6f84eaa50 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_2x2.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_2x2.xml @@ -44,7 +44,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml index 37525357fa..7eba071e16 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml @@ -43,7 +43,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml index 17c2c9f8b7..25ffb4b7b2 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml @@ -41,7 +41,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml index c520a82046..9f0c3bc93a 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml @@ -41,7 +41,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml index e9e9374cf1..7d8cd6a723 100644 --- a/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml +++ b/ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml @@ -44,7 +44,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-gnb oai-nr-ue + oai-gnb-asan oai-nr-ue-asan diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index e2c6d7ed0d..e5a0185be1 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -168,6 +168,7 @@ services: container_name: rfsim5g-oai-cu environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-ext-dn networks: @@ -186,6 +187,7 @@ services: container_name: rfsim5g-oai-du environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cu networks: @@ -204,6 +206,7 @@ services: container_name: rfsim5g-oai-du2 environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_ID 0xe01 --gNBs.[0].nr_cellid 87654321 --gNBs.[0].servingCellConfigCommon.[0].physCellId 1 --MACRLCs.[0].local_n_address 192.168.71.143 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cu networks: @@ -222,6 +225,7 @@ services: container_name: rfsim5g-oai-du3 environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --gNBs.[0].gNB_ID 0xe02 --gNBs.[0].nr_cellid 11111111 --gNBs.[0].servingCellConfigCommon.[0].physCellId 2 --MACRLCs.[0].local_n_address 192.168.71.144 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cu networks: @@ -240,6 +244,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.142 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du networks: @@ -258,6 +263,7 @@ services: container_name: rfsim5g-oai-nr-ue2 environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.143 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du2 networks: @@ -276,6 +282,7 @@ services: container_name: rfsim5g-oai-nr-ue3 environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.144 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du3 networks: 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 8cf83e8943..7912c48408 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -168,6 +168,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-ext-dn networks: @@ -186,6 +187,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: -E --sa --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 + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml index 86c678c811..38b82988f9 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml @@ -170,6 +170,7 @@ services: environment: TZ: Europe/Paris USE_ADDITIONAL_OPTIONS: --sa --nfapi VNF --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-spgwu - oai-amf @@ -206,6 +207,7 @@ services: TZ: Europe/Paris OPENAIR_DIR: /opt/oai-nr-ue USE_ADDITIONAL_OPTIONS: --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1 --log_config.global_log_options level,time,thread_id,nocolor + ASAN_OPTIONS: detect_leaks=0 volumes: - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index bbdfe7d1f4..d238d63ea1 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -168,6 +168,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --sa -E --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-ext-dn networks: @@ -186,6 +187,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -204,6 +206,7 @@ services: container_name: rfsim5g-oai-nr-ue2 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -222,6 +225,7 @@ services: container_name: rfsim5g-oai-nr-ue3 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -240,6 +244,7 @@ services: container_name: rfsim5g-oai-nr-ue4 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -258,6 +263,7 @@ services: container_name: rfsim5g-oai-nr-ue5 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -276,6 +282,7 @@ services: container_name: rfsim5g-oai-nr-ue6 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -294,6 +301,7 @@ services: container_name: rfsim5g-oai-nr-ue7 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -312,6 +320,7 @@ services: container_name: rfsim5g-oai-nr-ue8 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -330,6 +339,7 @@ services: container_name: rfsim5g-oai-nr-ue9 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -348,6 +358,7 @@ services: container_name: rfsim5g-oai-nr-ue10 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index 15df28bb7e..eaadeb1b1b 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -168,6 +168,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-ext-dn networks: @@ -186,6 +187,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index cd5c28b9ff..8ebf8602eb 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -168,6 +168,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-ext-dn networks: @@ -187,6 +188,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index 71f00f96c2..7b4a0fcc96 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -170,6 +170,7 @@ services: container_name: rfsim5g-oai-cucp environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-ext-dn networks: @@ -190,8 +191,8 @@ services: privileged: true container_name: rfsim5g-oai-cuup environment: - USE_ADDITIONAL_OPTIONS: --sa --rfsim - #--log_config.global_log_options level,nocolor,time + USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-cucp networks: @@ -213,6 +214,7 @@ services: container_name: rfsim5g-oai-du environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 networks: ran_net: ipv4_address: 192.168.72.142 @@ -230,6 +232,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.72.142 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml index 5ead5b485e..e3d21c6d13 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml @@ -6,6 +6,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 networks: public_net: ipv4_address: 192.168.71.140 @@ -24,6 +25,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 volumes: - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - rrc.config:/opt/oai-nr-ue/etc/rrc/ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml index 10d57983b8..145122d97e 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml @@ -6,6 +6,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 networks: public_net: ipv4_address: 192.168.71.140 @@ -24,6 +25,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 volumes: - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - rrc.config:/opt/oai-nr-ue/etc/rrc/ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml index dc1998dffa..eb2b59f5f4 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml @@ -6,6 +6,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 networks: public_net: ipv4_address: 192.168.71.140 @@ -24,6 +25,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 volumes: - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf - rrc.config:/opt/oai-nr-ue/etc/rrc/ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index 6055138e65..42fb6648e8 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -168,6 +168,7 @@ services: container_name: rfsim5g-oai-gnb environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-ext-dn networks: @@ -187,6 +188,7 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time + ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: