From cb7942d460575c77c2cedc6bdc395b40a9106bb2 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 1 Oct 2024 14:41:44 +0200 Subject: [PATCH] Build CI images for eNB/lteUE with sanitizers, and use in 4G RF sim --- ci-scripts/cls_containerize.py | 4 +++- ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml | 2 +- ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml | 2 +- ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml | 2 +- ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml | 2 +- ci-scripts/xml_files/container_4g_rfsim_fembms.xml | 2 +- ci-scripts/xml_files/container_4g_rfsim_mbms.xml | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 7b9956174e..3fdf10004b 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -58,7 +58,7 @@ import cls_oaicitest # Helper functions used here and in other classes # (e.g., cls_cluster.py) #----------------------------------------------------------- -IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-gnb-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72'] +IMAGES = ['oai-enb', 'oai-lte-ru', 'oai-lte-ue', 'oai-gnb', 'oai-nr-cuup', 'oai-gnb-aw2s', 'oai-nr-ue', 'oai-enb-asan', 'oai-gnb-asan', 'oai-lte-ue-asan', 'oai-nr-ue-asan', 'oai-nr-cuup-asan', 'oai-gnb-aerial', 'oai-gnb-fhi72'] def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge): if ranCommitID == '': @@ -421,7 +421,9 @@ class Containerize(): imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', '')) # Building again the 5G images with Address Sanitizer imageNames.append(('ran-build', 'build', 'ran-build-asan', '--build-arg "BUILD_OPTION=--sanitize"')) + imageNames.append(('oai-enb', 'eNB', 'oai-enb-asan', '--build-arg "BUILD_OPTION=--sanitize"')) imageNames.append(('oai-gnb', 'gNB', 'oai-gnb-asan', '--build-arg "BUILD_OPTION=--sanitize"')) + imageNames.append(('oai-lte-ue', 'lteUE', 'oai-lte-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"')) imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue-asan', '--build-arg "BUILD_OPTION=--sanitize"')) imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup-asan', '--build-arg "BUILD_OPTION=--sanitize"')) imageNames.append(('ran-build-fhi72', 'build.fhi72', 'ran-build-fhi72', '')) diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml index 3b0b58d8ba..9e8bb1e704 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml @@ -53,7 +53,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-enb oai-lte-ue + oai-enb-asan oai-lte-ue-asan diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml index abe07fa1ce..0081f8eab9 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml @@ -44,7 +44,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-enb oai-lte-ue + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml index 68879cc622..310f886497 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml @@ -48,7 +48,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-enb oai-lte-ue + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml index 5a58cad5f2..357db604a6 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml @@ -48,7 +48,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-enb oai-lte-ue + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml index e63c4fac5e..e1484004e2 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_fembms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_fembms.xml @@ -41,7 +41,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-enb oai-lte-ue + oai-enb-asan oai-lte-ue-asan Create_Workspace diff --git a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml index c26cb06878..cf154b4476 100644 --- a/ci-scripts/xml_files/container_4g_rfsim_mbms.xml +++ b/ci-scripts/xml_files/container_4g_rfsim_mbms.xml @@ -41,7 +41,7 @@ Pull_Local_Registry Pull Images from Local Registry 0 - oai-enb oai-lte-ue + oai-enb-asan oai-lte-ue-asan Create_Workspace