pre-commit config

.gitignore

@@ -7,7 +7,6 @@ cmake_targets/*/build/
 cmake_targets/ran_build/
 log/
 lte_build_oai/
-build*
 
 # IDE files
 .vscode

CMakeLists.txt

@@ -5,8 +5,8 @@ project (OpenAirInterface LANGUAGES C CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(OAI_VERSION 2.4.0)
 
-option(ENABLE_CHANNEL_SIM_CUDA "Enable CUDA accelerated channel simulation" OFF)
-if(ENABLE_CHANNEL_SIM_CUDA)
+option(CUDA_ENABLE "Enable CUDA accelerated channel simulation" OFF)
+if(CUDA_ENABLE)
     find_package(CUDA REQUIRED)
     find_package(CUDAToolkit REQUIRED)
     message(STATUS "CUDA explicitly enabled, building with GPU acceleration support.")
@@ -34,7 +34,7 @@ if(ENABLE_CHANNEL_SIM_CUDA)
         message(STATUS "CUDA Explicit Copy path enabled (default ATS was overridden).")
     endif()
 
-    add_compile_definitions(CHANNEL_SIM_CUDA)
+    add_compile_definitions(ENABLE_CUDA)
 endif()
 
 #########################################################
@@ -83,40 +83,25 @@ option(PACKAGING_COMMON "Will produce a package containing common target, config
 option(PACKAGING_USRP "Will produce a package containing usrp target, configuration files and docs" OFF)
 option(PACKAGING_PHYSIM "Will produce a package containing physim target, configuration files and docs" OFF)
 
+
 # Check if asn1c is installed, and check if it supports all options we need
 # a user can provide ASN1C_EXEC to override an asn1c to use (e.g., parallel
 # installation)
 find_program(ASN1C_EXEC_PATH asn1c HINTS /opt/asn1c/bin)
 set(ASN1C_EXEC ${ASN1C_EXEC_PATH} CACHE FILEPATH "path to asn1c executable")
-option(AUTO_DOWNLOAD_ASN1C "Automatically download asn1c if not found" OFF)
-if (ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
-  check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
-  add_custom_target(asn1c DEPENDS ${ASN1C_EXEC})
-else ()
-  if (NOT AUTO_DOWNLOAD_ASN1C)
-    message(FATAL_ERROR "asn1c not found. Install it globally or activate AUTO_DOWNLOAD_ASN1C")
-  endif()
-  message(STATUS "Downloading and compile asn1c local in this build tree")
-  include(ExternalProject)
-  ExternalProject_Add(
-    asn1c_gen
-    GIT_REPOSITORY https://github.com/mouse07410/asn1c
-    GIT_TAG 940dd5fa9f3917913fd487b13dfddfacd0ded06e
-    GIT_REMOTE_UPDATE_STRATEGY CHECKOUT
-    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/asn1c
-    BUILD_IN_SOURCE True
-    CONFIGURE_COMMAND autoreconf -i
-    BUILD_COMMAND ./configure --prefix ${CMAKE_BINARY_DIR}
-    COMMAND make -j8 CFLAGS=-fno-strict-aliasing -Wmisleading-indentation
-    STEP_TARGETS build
-  )
-  set(ASN1C_EXEC ${CMAKE_BINARY_DIR}/bin/asn1c)
-  add_custom_target(asn1c DEPENDS asn1c_gen)
+if(NOT ASN1C_EXEC)
+    message(FATAL_ERROR "No asn1c found!
+You might want to re-run ./build_oai -I
+Or provide a path to asn1c using
+./build_oai ... --cmake-opt -DASN1C_EXEC=/path/to/asn1c
+")
 endif()
+check_option(${ASN1C_EXEC} -gen-APER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-UPER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-JER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-BER ASN1C_EXEC)
+check_option(${ASN1C_EXEC} -no-gen-OER ASN1C_EXEC)
+
 #########################################################
 # Base directories, compatible with legacy OAI building #
 #########################################################
@@ -155,17 +140,14 @@ add_boolean_option(AVX512 ${AUTODETECT_AVX512} "Whether AVX512 intrinsics is ava
 eval_boolean(AUTODETECT_AVX2 DEFINED CPUFLAGS AND CPUFLAGS MATCHES "avx2")
 add_boolean_option(AVX2 ${AUTODETECT_AVX2} "Whether AVX2 intrinsics is available on the host processor" ON)
 
-eval_boolean(AUTODETECT_GFNI DEFINED CPUFLAGS AND CPUFLAGS MATCHES "gfni")
-add_boolean_option(GFNI ${AUTODETECT_GFNI} "Whether GFNI intrinsics is available on the host processor" ON)
-
 message(STATUS "CPU architecture is ${CMAKE_SYSTEM_PROCESSOR}")
 if (CROSS_COMPILE)
   message(STATUS "setting as aarch64")
   set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -gdwarf-2 -lgcc -lrt")
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   # The following intrinsics are assumed to be available on any x86 system
-  # (avx, f16c, fma, mmx, pclmul, sse, sse2, sse3, xop)
-  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
+  # (avx, f16c, fma, gnfi, mmx, pclmul, sse, sse2, sse3, xop)
+  set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_AVX_NATIVE -DSIMDE_X86_F16C_NATIVE -DSIMDE_X86_FMA_NATIVE -DSIMDE_X86_GFNI_NATIVE -DSIMDE_X86_MMX_NATIVE -DSIMDE_X86_PCLMUL_NATIVE -DSIMDE_X86_SSE2_NATIVE -DSIMDE_X86_SSE3_NATIVE -DSIMDE_X86_SSE_NATIVE -DSIMDE_X86_XOP_HAVE_COM_ -DSIMDE_X86_XOP_NATIVE")
   message(STATUS "AVX512 intrinsics are ${AVX512}")
   if(${AVX512})
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX512BW_NATIVE -DSIMDE_X86_AVX512F_NATIVE -DSIMDE_X86_AVX512VL_NATIVE -mavx512bw -march=skylake-avx512 -mtune=skylake-avx512")
@@ -176,17 +158,13 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   if(${AVX2})
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_AVX2_NATIVE -DSIMDE_X86_VPCLMULQDQ_NATIVE")
   endif()
-  message(STATUS "GFNI intrinsics are ${GFNI}")
-  if(${GFNI})
-    set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_GFNI_NATIVE -mgfni")
-  endif()
-  if (CPUFLAGS MATCHES "sse4_1")
+  if (CPUINFO MATCHES "sse4_1")
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_1_NATIVE")
   endif()
-  if(CPUFLAGS MATCHES "sse4_2")
+  if(CPUINFO MATCHES "sse4_2")
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSE4_2_NATIVE")
   endif()
-  if(CPUFLAGS MATCHES "ssse3")
+  if(CPUINFO MATCHES "ssse3")
     set(C_FLAGS_PROCESSOR "${C_FLAGS_PROCESSOR} -DSIMDE_X86_SSSE3_NATIVE")
   endif()
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
@@ -228,9 +206,9 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(commonOpts "${commonOpts} -Wno-packed-bitfield-compat")
 endif()
 # clang: suppress complaints about unused command line argument (-rdynamic only
-# used during linking) and "const member leaves the object uninitialized"
+# used during linking)
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  set(commonOpts "${commonOpts} -Wno-unused-command-line-argument -Wno-default-const-init-field-unsafe")
+  set(commonOpts "${commonOpts} -Wno-unused-command-line-argument")
 endif()
 
 set(CMAKE_C_FLAGS
@@ -442,6 +420,7 @@ add_library(ngap
   ${NGAP_DIR}/ngap_gNB_pdu_session_management.c
   ${NGAP_DIR}/ngap_gNB_nnsf.c
   ${NGAP_DIR}/ngap_gNB_overload.c
+  ${NGAP_DIR}/ngap_gNB_trace.c
   ${NGAP_DIR}/ngap_gNB_ue_context.c
   ${NGAP_DIR}/ngap_gNB_NRPPa_transport_procedures.c
   )
@@ -849,7 +828,6 @@ set(PHY_NRLDPC_CODINGIF
 )
 
 add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts_neon.c)
-target_compile_options(dfts PRIVATE -fno-semantic-interposition)
 
 set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_common.c
@@ -890,6 +868,7 @@ set(PHY_SRC_COMMON
   ${OPENAIR1_DIR}/PHY/TOOLS/sqrt.c
   ${OPENAIR1_DIR}/PHY/TOOLS/get_sin_cos.c
   ${OPENAIR1_DIR}/PHY/TOOLS/oai_arith_operations.c
+  ${OPENAIR1_DIR}/PHY/log_tools.c
   )
 
 set(PHY_SRC
@@ -1144,20 +1123,12 @@ set(NR_PDCP_SRC
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia2.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_integrity_nia1.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/asn1_utils.c
-  )
-
-# gNB: PDCP + CU-CP/CU-UP interface
-set(NR_PDCP_SRC_GNB
-  ${NR_PDCP_SRC}
   openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c
   openair2/LAYER2/nr_pdcp/cuup_cucp_if.c
   openair2/LAYER2/nr_pdcp/cuup_cucp_direct.c
   openair2/LAYER2/nr_pdcp/cuup_cucp_e1ap.c
   )
 
-# UE build: PDCP only; CU-CP/CU-UP interface is gNB-only.
-set(NR_PDCP_SRC_UE ${NR_PDCP_SRC})
-
 set(NR_SDAP_SRC
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap.c
   ${OPENAIR2_DIR}/SDAP/nr_sdap/nr_sdap_entity.c
@@ -1201,7 +1172,7 @@ set(L2_LTE_SRC
   )
 
 set(L2_NR_SRC
-  ${NR_PDCP_SRC_GNB}
+  ${NR_PDCP_SRC}
   ${NR_SDAP_SRC}
   ${NR_RRC_DIR}/rrc_gNB.c
   ${NR_RRC_DIR}/mac_rrc_dl_direct.c
@@ -1237,7 +1208,7 @@ set(L2_RRC_SRC_UE
   )
 
 set(NR_L2_SRC_UE
-  ${NR_PDCP_SRC_UE}
+  ${NR_PDCP_SRC}
   ${NR_SDAP_SRC}
   ${NR_UE_RRC_DIR}/L2_interface_ue.c
   ${NR_UE_RRC_DIR}/main_ue.c
@@ -1279,9 +1250,7 @@ set (MAC_NR_SRC
   ${NR_GNB_MAC_DIR}/gNB_scheduler.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_bch.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_dlsch.c
-  ${NR_GNB_MAC_DIR}/gNB_scheduler_dlsch_default_policies.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_ulsch.c
-  ${NR_GNB_MAC_DIR}/gNB_scheduler_ulsch_default_policies.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_primitives.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_phytest.c
   ${NR_GNB_MAC_DIR}/gNB_scheduler_uci.c
@@ -1383,7 +1352,6 @@ add_library(e1_if
 target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap SECURITY ${OPENSSL_LIBRARIES} e1ap GTPV1U)
 
 target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc nr_common)
-target_compile_definitions(L2_NR PRIVATE PDCP_CUCP_CUUP)
 if(OAI_AERIAL)
     target_compile_definitions(L2_NR PRIVATE ENABLE_AERIAL)
 endif()
@@ -1391,6 +1359,7 @@ endif()
 add_library(L2_LTE_NR
   # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file)
   ${MAC_DIR}/dummy_functions.c
+  ${ENB_APP_SRC}
 )
 
 target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc)
@@ -1916,7 +1885,7 @@ add_executable(nr-cuup
   executables/nr-cuup.c
   ${NR_RRC_DIR}/rrc_gNB_UE_context.c
   ${OPENAIR2_DIR}/E1AP/e1ap_setup.c
-  ${NR_PDCP_SRC_GNB}
+  ${NR_PDCP_SRC}
   ${NR_SDAP_SRC}
   )
 
@@ -1927,7 +1896,6 @@ target_link_libraries(nr-cuup PRIVATE
                       alg
                       dl pthread ${T_LIB})
 target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
-target_compile_definitions(nr-cuup PRIVATE PDCP_CUCP_CUUP)
 if(E2_AGENT)
   target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
   target_compile_definitions(nr-cuup PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT)
@@ -2108,13 +2076,13 @@ target_link_libraries(nr_srssim PRIVATE
   m pthread ITTI dl nr_ue_phy_meas physim_common softmodem_common
   )
 
-if(ENABLE_CHANNEL_SIM_CUDA)
+if(CUDA_ENABLE)
   if (TARGET oai_cuda_lib)
       target_link_libraries(nr_dlsim PRIVATE oai_cuda_lib)
       target_link_libraries(nr_ulsim PRIVATE oai_cuda_lib)
 
-      target_compile_definitions(nr_dlsim PRIVATE CHANNEL_SIM_CUDA)
-      target_compile_definitions(nr_ulsim PRIVATE CHANNEL_SIM_CUDA)
+      target_compile_definitions(nr_dlsim PRIVATE ENABLE_CUDA)
+      target_compile_definitions(nr_ulsim PRIVATE ENABLE_CUDA)
   endif()
 endif()
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->
 
-# Contributing to OpenAirInterface
+# Contributing to OpenAirInterface #
 
 We want to make contributing to this project as easy and transparent as possible.
 
@@ -11,10 +11,10 @@ Please refer to the steps described on our website: [How to contribute to OAI](h
    if you do not have any.
    - We recommend that you register with a professional or student email address.
    - If your email domain (`@domain.com`) is not whitelisted, please contact us
-     (mailto:oaicicdteam@openairinterface.org).
+     (mailto:contact@openairinterface.org).
    - Eurecom GitLab does NOT accept public email domains.
 3. Provide the OAI team with the **username** of this account to
-   (mailto:oaicicdteam@openairinterface.org) ; we will give you the developer
+   (mailto:contact@openairinterface.org) ; we will give you the developer
    rights on this repository.
 4. The contributing policies are described in the [corresponding documentation
    page](doc/code-style-contrib.md).
@@ -24,43 +24,8 @@ Please refer to the steps described on our website: [How to contribute to OAI](h
      request from a forked repository.
       * This decision was made for the license reasons.
       * The Continuous Integration will reject your merge request.
-5. Mandatory signing of all the commits using the email address used for CLA.
 
-## Commit Guidelines
-
-### Signing Commits
-
-To sign commits:
-
-You can also get the verified label
-on your commits via using [SSH KEYS or GPG KEYS](https://docs.gitlab.com/user/project/repository/signed_commits/)
-
-```
-# Edit .git/config in the git repository you are working on
-# Add the user section
-[user]
-    name = YOUR NAME
-    email = YOUR EMAIL ADDRESS
-
-# If you use a signing key, use the below configuration instead
-[user]
-    name = YOUR NAME
-    email = YOUR EMAIL ADDRESS
-    signingkey = LOCATION OF SSH KEYS or GPG KEY
-
-[gpg]
-    format = ssh
-
-[commit]
-    gpgsign = true
-```
-
-> **NOTE:** If your commits are not signed the CI framework will not accept the MR.
-
-For more information regarding contribution guidelines
-please check [this document](doc/code-style-contrib.md)
-
-## License
+# License #
 
 By contributing to OpenAirInterface, you agree that your contributions will be
 licensed under

NOTICE

@@ -84,11 +84,3 @@ Nuand: https://github.com/Nuand/bladeRF/tree/master?tab=License-1-ov-file
 
 Credits for https://github.com/pothosware/SoapySDR
 Pothosware: BSL 1.0 License
-
-Credits for https://github.com/zeromq/libzmq
-ZeroMQ authors: Mozilla Public License Version 2.0
-
-Credits for source code:
-  - radio/zmq/zmq_imported.cpp
-  - radio/zmq/zmq_imported.h
-Software Radio Systems Limited: BSD-3-Clause-Open-MPI

README.md

@@ -8,9 +8,8 @@
     <a href="https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-CSSL--v1.0-blue" alt="License"></a>
     <a href="https://releases.ubuntu.com/22.04/"><img src="https://img.shields.io/badge/OS-Ubuntu22-Green" alt="Supported OS Ubuntu 22"></a>
     <a href="https://releases.ubuntu.com/24.04/"><img src="https://img.shields.io/badge/OS-Ubuntu24-Green" alt="Supported OS Ubuntu 24"></a>
-    <a href="https://releases.ubuntu.com/26.04/"><img src="https://img.shields.io/badge/OS-Ubuntu26-Green" alt="Supported OS Ubuntu 26"></a>
     <a href="https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux"><img src="https://img.shields.io/badge/OS-RHEL9-Green" alt="Supported OS RHEL9"></a>
-    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore44-Green" alt="Supported OS Fedora 44"></a>
+    <a href="https://getfedora.org/en/workstation/"><img src="https://img.shields.io/badge/OS-Fedore41-Green" alt="Supported OS Fedora 43"></a>
 </p>
 
 <p align="center">

build/.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+repos:
+  # Clang-Format: Ensures code style is consistent
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: 'v22.1.3'
+    hooks:
+      - id: clang-format
+
+  # Cppcheck: Static analysis to find bugs
+  - repo: https://github.com/pocc/pre-commit-hooks
+    rev: 'v1.3.5'
+    hooks:
+      - id: cppcheck
+
+  # Basic sanity checks (trailing whitespace, end of file, etc.)
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: 'v6.0.0'
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: end-of-file-fixer

ci-scripts/Jenkinsfile

@@ -20,13 +20,12 @@ if (params.LockResources != null && params.LockResources.trim().length() > 0)
 // Global Parameters. Normally they should be populated when the master job
 // triggers the slave job with parameters
 
-def INTERNAL_REPO = "asterix:/home/git/openairinterface5g.git"
-def sourceBranch = params.sourceBranch ?: env.GIT_BRANCH
-def targetBranch = params.targetBranch ?: 'develop'
-def commitID = params.sourceCommit ?: env.GIT_COMMIT
-def testRepository = params.customRepository ?: INTERNAL_REPO
-def testBranch = params.customBranch ?: "${sourceBranch}-${commitID}"
-def mergeWithTarget = params.mergeWithTarget ?: false
+def sourceRepository = params.eNB_Repository ?: env.GIT_URL
+def sourceBranch = params.eNB_Branch ?: env.GIT_BRANCH
+def targetRepository = params.Target_Repository ?: sourceRepository
+def targetBranch = params.eNB_TargetBranch ?: 'develop'
+def commitID = params.eNB_CommitID ?: env.GIT_COMMIT
+def is_MR = params.eNB_mergeRequest ?: false
 
 def flexricOption = ""
 def runWithOC = false
@@ -51,7 +50,7 @@ pipeline {
           JOB_TIMESTAMP = sh(returnStdout: true, script: 'date --utc --rfc-3339=seconds | sed -e "s#+00:00##"').trim()
         }
         // update the build name and description
-        buildName "${params.requestNumber}"
+        buildName "${params.eNB_MR}"
         buildDescription "Branch : ${sourceBranch}"
       }
     }
@@ -65,12 +64,12 @@ pipeline {
             echo "no LockResources given"
             allParametersPresent = false
           }
-          if (params.workspace == null) {
-            echo "no workspace given"
+          if (params.eNB_SourceCodePath == null) {
+            echo "no eNB_SourceCodePath given"
             allParametersPresent = false
           }
           if (params.OC_Credentials != null) {
-            echo "This pipeline is configured to run with Openshift Cluster."
+            echo "This pipeline is configured to run with Opensift Cluster."
             runWithOC = true
             if (params.OC_ProjectName == null) {
               echo "no OC_ProjectName given"
@@ -85,11 +84,21 @@ pipeline {
           }
 
           echo "CI executor node    :   ${pythonExecutor}"
-          echo "Testing Repository  :   ${testRepository}"
-          echo "Testing Branch      :   ${testBranch}"
+          echo "Source Repository   :   ${sourceRepository}"
+          echo "Source Branch       :   ${sourceBranch}"
+          echo "Target Repository   :   ${targetRepository}"
+          echo "Target Branch       :   ${targetBranch}"
+          echo "Commit ID           :   ${commitID}"
 
           if (allParametersPresent) {
             echo '\u2705 \u001B[94m All parameters are present\u001B[0m'
+            if (is_MR) {
+              sh "git fetch"
+              sh "./ci-scripts/doGitLabMerge.sh --src-branch ${sourceBranch} --src-commit ${commitID} --target-branch ${targetBranch} --target-commit latest"
+            } else {
+              sh "git fetch"
+              sh "git checkout -f ${commitID}"
+            }
           } else {
             echo "\u274C Some parameters are missing"
             sh "./ci-scripts/fail.sh"
@@ -112,21 +121,28 @@ pipeline {
               }
             }
             sh """
-              python3 main.py --mode=InitiateHtml --repository=${testRepository} \
-                              --branch=${testBranch} --commitID=${commitID} \
-                              ${mainPythonAllXmlFiles}
+              python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                              --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                              --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                              ${flexricOption} ${mainPythonAllXmlFiles}
             """
             if (runWithOC) {
               withCredentials([usernamePassword(credentialsId: "${params.OC_Credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password')]) {
+                sh """
+                  python3 main.py --mode=InitiateHtml --ranRepository=${targetRepository} \
+                                  --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                  --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                  ${flexricOption} ${mainPythonAllXmlFiles}
+                """
                 for (xmlFile in myXmlTestSuite) {
                   if (fileExists(xmlFile)) {
                     try {
                       timeout (time: 60, unit: 'MINUTES') {
                         sh """
-                          python3 main.py --mode=TesteNB --repository=${testRepository} \
-                                          --branch=${testBranch} \
-                                          --ranAllowMerge=${mergeWithTarget} --targetBranch=${targetBranch} \
-                                          --workspace=${params.workspace} --XMLTestFile=${xmlFile} \
+                          python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                          --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                          --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                          --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
                                           --OCUserName=${OC_Username} --OCPassword=${OC_Password} --OCProjectName=${OC_ProjectName} \
                                           ${flexricOption}
                         """
@@ -144,10 +160,10 @@ pipeline {
                   try {
                     timeout (time: 60, unit: 'MINUTES') {
                       sh """
-                        python3 main.py --mode=TesteNB --repository=${testRepository} \
-                                        --branch=${testBranch} \
-                                        --ranAllowMerge=${mergeWithTarget} --targetBranch=${targetBranch} \
-                                        --workspace=${params.workspace} --XMLTestFile=${xmlFile} \
+                        python3 main.py --mode=TesteNB --ranRepository=${targetRepository} \
+                                        --ranBranch=${sourceBranch} --ranCommitID=${commitID} \
+                                        --ranAllowMerge=${is_MR} --ranTargetBranch=${targetBranch} \
+                                        --eNBSourceCodePath=${params.eNB_SourceCodePath} --XMLTestFile=${xmlFile} \
                                         ${flexricOption}
                       """
                     }

ci-scripts/Jenkinsfile-GitLab-Container

@@ -87,20 +87,9 @@ pipeline {
             // since a bit, in push events, gitlabUserEmail is not populated
             gitCommitAuthorEmailAddr = env.gitlabUserEmail
             echo "GitLab Usermail is ${gitCommitAuthorEmailAddr}"
-            // Validate MR commits: checks for missing Signed-off-by and merge commits
-            def mrValidationLog = "signedCommit_${env.BUILD_NUMBER}.log"
-            def mrValidationExitCode = sh(
-                script: "bash ./ci-scripts/pre-ci-check.sh -s origin/${env.gitlabSourceBranch} -t origin/${env.gitlabTargetBranch} > ${mrValidationLog} 2>&1",
-                returnStatus: true
-            )
-            def mrValidationMessage = readFile(mrValidationLog).trim()
-            sh "rm -f ${mrValidationLog}"
-            if (mrValidationExitCode >= 1) {
-              addGitLabMRComment comment: "${mrValidationMessage}"
-            }
-            if (mrValidationExitCode >= 2) {
-              error("${mrValidationMessage}")
-            }
+            // GitLab-Jenkins plugin integration is lacking to perform the merge by itself
+            // Doing it manually --> it may have merge conflicts
+            sh "./ci-scripts/doGitLabMerge.sh --src-branch ${env.gitlabSourceBranch} --src-commit ${env.gitlabMergeRequestLastCommit} --target-branch ${env.gitlabTargetBranch} --target-commit ${GIT_COMMIT}"
           } else {
             echo "Git Branch    is ${GIT_BRANCH}"
             echo "Git Commit    is ${GIT_COMMIT}"
@@ -111,19 +100,29 @@ pipeline {
           }
         }
       }
+      post {
+        failure {
+          script {
+            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI"
+            addGitLabMRComment comment: message
+            currentBuild.result = 'FAILURE'
+          }
+        }
+      }
     }
     stage ("Local-Repo-Push") {
       steps {
         script {
-          triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
+          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+            triggerSlaveJob ('RAN-Local-Repo-Push', 'Local-Repo-Push')
+          }
         }
       }
       post {
         failure {
           script {
-            def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Cannot perform CI - merge validation failed (merge conflict, git operation failure, or internal CI error)."
-            addGitLabMRComment comment: message
-            currentBuild.result = 'FAILURE'
+            echo "Push to local repository KO"
+            failingStages += '\n * RAN-Local-Repo-Push'
           }
         }
       }
@@ -749,29 +748,6 @@ pipeline {
             }
           }
         }
-        stage ("SA-FHI72-MPLANE-CN5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-SA-FHI72-MPLANE-CN5G', 'SA-FHI72-MPLANE-CN5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                saFHI72MplaneStatus = finalizeSlaveJob('RAN-SA-FHI72-MPLANE-CN5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += saFHI72MplaneStatus
-              }
-            }
-          }
-        }
         stage ("SA-Handover-CN5G") {
           when { expression {do5Gtest} }
           steps {
@@ -880,19 +856,12 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
   def localStatus = build job: jobName,
     parameters: [
       string(name: 'eNB_Repository', value: String.valueOf(GIT_URL)),
-      string(name: 'targetRepo', value: String.valueOf(GIT_URL)),
       string(name: 'SourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
-      string(name: 'sourceRepo', value: String.valueOf(env.gitlabSourceRepoHttpUrl)),
       string(name: 'eNB_Branch', value: String.valueOf(env.gitlabSourceBranch)),
-      string(name: 'sourceBranch', value: String.valueOf(env.gitlabSourceBranch)),
       string(name: 'eNB_CommitID', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
-      string(name: 'sourceCommit', value: String.valueOf(env.gitlabMergeRequestLastCommit)),
       string(name: 'eNB_MR', value: String.valueOf(MR_NUMBER)),
-      string(name: 'requestNumber', value: String.valueOf(MR_NUMBER)),
       booleanParam(name: 'eNB_mergeRequest', value: "MERGE".equals(env.gitlabActionType)),
-      booleanParam(name: 'mergeWithTarget', value: "MERGE".equals(env.gitlabActionType)),
-      string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch)),
-      string(name: 'targetBranch', value: String.valueOf(env.gitlabTargetBranch))
+      string(name: 'eNB_TargetBranch', value: String.valueOf(env.gitlabTargetBranch))
     ], propagate: false
   def localResult = localStatus.getResult()
   echo "${jobName} Slave Job status is ${localResult}"
@@ -907,13 +876,14 @@ def triggerSlaveJob (jobName, gitlabStatusName) {
 
 def triggerCN5GSlaveJob (jobName, gitlabStatusName) {
   if ("MERGE".equals(env.gitlabActionType)) {
-    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.gitlabMergeRequestLastCommit
-    shaOne = shaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shaOne
+    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.gitlabMergeRequestLastCommit
+    shortenShaOne = shortenShaOne.trim()
+    branchName = env.gitlabSourceBranch.replaceAll("/", "-").trim()
+    fullRanTag = OAI_Registry + '/oai-gnb:' + env.gitlabSourceBranch + '-' + shortenShaOne
   } else {
-    shaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%H" ' + env.GIT_COMMIT
-    shaOne = shaOne.trim()
-    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shaOne
+    shortenShaOne = sh returnStdout: true, script: 'git log -1 --pretty=format:"%h" --abbrev=8 ' + env.GIT_COMMIT
+    shortenShaOne = shortenShaOne.trim()
+    fullRanTag = OAI_Registry + '/oai-gnb:develop-' + shortenShaOne
   }
   // Workaround for the "cancelled" GitLab pipeline notification
   // The slave job is triggered with the propagate false so the following commands are executed

ci-scripts/Jenkinsfile-push-local-repo

@@ -27,26 +27,21 @@ pipeline {
       steps {
         script {
           def missingParams = []
-          if (!params.sourceRepo?.trim())   { missingParams << 'sourceRepo' }
-          if (!params.sourceBranch?.trim())   { missingParams << 'sourceBranch' }
-          if (!params.sourceCommit?.trim()) { missingParams << 'sourceCommit' }
-          if (params.mergeWithTarget) {
-            if (!params.targetRepo?.trim())   { missingParams << 'targetRepo' }
-            if (!params.targetBranch?.trim()) { missingParams << 'targetBranch' }
-          }
+          if (!params.SourceRepo?.trim())       { missingParams << 'SourceRepo' }
+          if (!params.eNB_Branch?.trim())       { missingParams << 'eNB_Branch' }
+          if (!params.eNB_CommitID?.trim())     { missingParams << 'eNB_CommitID' }
+          if (!params.eNB_TargetBranch?.trim()) { missingParams << 'eNB_TargetBranch' }
+          if (!params.eNB_Repository?.trim())   { missingParams << 'eNB_Repository' }
 
           if (missingParams) {
             error "Missing required parameters: ${missingParams.join(', ')}"
           }
 
-          echo "Source Repo   : ${params.sourceRepo}"
-          echo "Source Branch : ${params.sourceBranch}"
-          echo "Source Commit : ${params.sourceCommit}"
-          echo "Merge         : ${params.mergeWithTarget}"
-          if (params.mergeWithTarget) {
-            echo "Target Branch : ${params.targetBranch}"
-            echo "Target Repo   : ${params.targetRepo}"
-          }
+          echo "Source Repo   : ${params.SourceRepo}"
+          echo "Source Branch : ${params.eNB_Branch}"
+          echo "Source Commit : ${params.eNB_CommitID}"
+          echo "Target Branch : ${params.eNB_TargetBranch}"
+          echo "Target Repo   : ${params.eNB_Repository}"
         }
       }
     }
@@ -56,7 +51,6 @@ pipeline {
           git config user.email "jenkins@openairinterface.org"
           git config user.name "OAI Jenkins"
           git remote remove source || true
-          git remote remove target || true
           git remote remove internal-repo || true
         """
       }
@@ -64,38 +58,31 @@ pipeline {
     stage('Add source repo & fetch branches') {
       steps {
         sh """
-          git remote add source ${params.sourceRepo} || true
-          git fetch source ${params.sourceBranch}
+          git remote add source ${params.SourceRepo} || true
+          git fetch source ${params.eNB_Branch}
+          git fetch origin ${params.eNB_TargetBranch}
         """
-        script {
-          if (params.mergeWithTarget) {
-            sh """
-              git remote add target ${params.targetRepo} || true
-              git fetch target ${params.targetBranch}
-            """
-          }
-        }
       }
     }
     stage('Create temporary branch for CI') {
       steps {
         script {
-          env.NEW_BRANCH = "${params.sourceBranch}-${params.sourceCommit}"
+          def shortCommit = params.eNB_CommitID.take(8)
+          env.NEW_BRANCH = "${params.eNB_Branch}-${shortCommit}"
           echo "New branch: ${env.NEW_BRANCH}"
         }
         sh """
           # Checkout source commit
-          git checkout -B ${env.NEW_BRANCH} ${params.sourceCommit}
+          git checkout -B ${env.NEW_BRANCH} ${params.eNB_CommitID}
         """
       }
     }
     stage('Merge target into source') {
-      when { expression { return params.mergeWithTarget } }
       steps {
         sh """
-          echo "Merging target branch ${params.targetBranch} into source branch ${env.NEW_BRANCH}"
-          if ! git merge --ff target/${params.targetBranch} \
-            -m "Merge ${params.targetBranch} into ${params.sourceBranch} for CI"; then
+          echo "Merging target branch ${params.eNB_TargetBranch} into source branch ${env.NEW_BRANCH}"
+          if ! git merge --ff origin/${params.eNB_TargetBranch} \
+            -m "Merge ${params.eNB_TargetBranch} into ${params.eNB_Branch} for CI"; then
             echo "Merge conflicts detected. Aborting."
             git merge --abort || true
             exit 1

ci-scripts/Jenkinsfile-push-registry

@@ -56,7 +56,7 @@ pipeline {
               echo "Forced Tag is ${WEEK_TAG}"
             }
           }
-          WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%H" origin/develop'
+          WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%h" origin/develop | cut -c 1-8'
           WEEK_SHA = WEEK_SHA.trim()
 
           withCredentials([

ci-scripts/args_parse.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
 #---------------------------------------------------------------------
-# Python for CI testing
+# Python for CI of OAI-eNB + COTS-UE
 #
 #   Required Python Version
 #     Python 3.x
@@ -44,55 +44,74 @@ def ArgsParse(argvs,CiTestObj,RAN,HTML,CONTAINERS,HELP,CLUSTER):
         elif re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-mode=(.+)$', myArgv, re.IGNORECASE)
             mode = matchReg.group(1)
-        elif re.match(r'^\-\-repository=(.+)$|^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-repository=(.+)$', myArgv, re.IGNORECASE)
+        elif re.match(r'^\-\-eNBRepository=(.+)$|^\-\-ranRepository(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBRepository=(.+)$', myArgv, re.IGNORECASE)
             else:
                 matchReg = re.match(r'^\-\-ranRepository=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.repository = matchReg.group(1)
-            RAN.repository=matchReg.group(1)
-            HTML.repository=matchReg.group(1)
-            CONTAINERS.repository=matchReg.group(1)
-            CLUSTER.repository=matchReg.group(1)
-        elif re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
-            matchReg = re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranRepository = matchReg.group(1)
+            RAN.ranRepository=matchReg.group(1)
+            HTML.ranRepository=matchReg.group(1)
+            CONTAINERS.ranRepository=matchReg.group(1)
+            CLUSTER.ranRepository=matchReg.group(1)
+        elif re.match(r'^\-\-eNB_AllowMerge=(.+)$|^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNB_AllowMerge=(.+)$', myArgv, re.IGNORECASE)
+            else:
+                matchReg = re.match(r'^\-\-ranAllowMerge=(.+)$', myArgv, re.IGNORECASE)
             doMerge = matchReg.group(1)
             if ((doMerge == 'true') or (doMerge == 'True')):
-                RAN.merge=True
-                CONTAINERS.merge=True
-                CLUSTER.merge=True
-        elif re.match(r'^\-\-branch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-branch=(.+)$', myArgv, re.IGNORECASE)
+                CiTestObj.ranAllowMerge = True
+                RAN.ranAllowMerge=True
+                HTML.ranAllowMerge=True
+                CONTAINERS.ranAllowMerge=True
+                CLUSTER.ranAllowMerge=True
+        elif re.match(r'^\-\-eNBBranch=(.+)$|^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBBranch=(.+)$', myArgv, re.IGNORECASE)
             else:
                 matchReg = re.match(r'^\-\-ranBranch=(.+)$', myArgv, re.IGNORECASE)
-            CiTestObj.branch = matchReg.group(1)
-            RAN.branch=matchReg.group(1)
-            HTML.branch=matchReg.group(1)
-            CONTAINERS.branch=matchReg.group(1)
-            CLUSTER.branch=matchReg.group(1)
-        elif re.match(r'^\-\-commitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-commitID=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-commitID=(.*)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranBranch = matchReg.group(1)
+            RAN.ranBranch=matchReg.group(1)
+            HTML.ranBranch=matchReg.group(1)
+            CONTAINERS.ranBranch=matchReg.group(1)
+            CLUSTER.ranBranch=matchReg.group(1)
+        elif re.match(r'^\-\-eNBCommitID=(.*)$|^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBCommitID=(.*)$', myArgv, re.IGNORECASE)
             else:
                 matchReg = re.match(r'^\-\-ranCommitID=(.*)$', myArgv, re.IGNORECASE)
-            HTML.commitID=matchReg.group(1)
-        elif re.match(r'^\-\-targetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-targetBranch=(.*)$', myArgv, re.IGNORECASE)
+            CiTestObj.ranCommitID = matchReg.group(1)
+            RAN.ranCommitID=matchReg.group(1)
+            HTML.ranCommitID=matchReg.group(1)
+            CONTAINERS.ranCommitID=matchReg.group(1)
+            CLUSTER.ranCommitID=matchReg.group(1)
+        elif re.match(r'^\-\-eNBTargetBranch=(.*)$|^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE):
+                matchReg = re.match(r'^\-\-eNBTargetBranch=(.*)$', myArgv, re.IGNORECASE)
             else:
                 matchReg = re.match(r'^\-\-ranTargetBranch=(.*)$', myArgv, re.IGNORECASE)
-            RAN.targetBranch=matchReg.group(1)
-            CONTAINERS.targetBranch=matchReg.group(1)
-            CLUSTER.targetBranch=matchReg.group(1)
-        elif re.match(r'^\-\-workspace=(.+)$|^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
-            if re.match(r'^\-\-workspace=(.+)$', myArgv, re.IGNORECASE):
-                matchReg = re.match(r'^\-\-workspace=(.+)$', myArgv, re.IGNORECASE)
-            else:
+            CiTestObj.ranTargetBranch = matchReg.group(1)
+            RAN.ranTargetBranch=matchReg.group(1)
+            HTML.ranTargetBranch=matchReg.group(1)
+            CONTAINERS.ranTargetBranch=matchReg.group(1)
+            CLUSTER.ranTargetBranch=matchReg.group(1)
+        elif re.match(r'^\-\-eNBIPAddress=(.+)$|^\-\-eNB[1-2]IPAddress=(.+)$', myArgv, re.IGNORECASE):
+            print("parameters --eNB*IPAddress ignored")
+        elif re.match(r'^\-\-eNBUserName=(.+)$|^\-\-eNB[1-2]UserName=(.+)$', myArgv, re.IGNORECASE):
+            print("parameters --eNB*UserName ignored")
+        elif re.match(r'^\-\-eNBPassword=(.+)$|^\-\-eNB[1-2]Password=(.+)$', myArgv, re.IGNORECASE):
+            print("parameter --eNB*Password ignored")
+        elif re.match(r'^\-\-eNBSourceCodePath=(.+)$|^\-\-eNB[1-2]SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+            if re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE):
                 matchReg = re.match(r'^\-\-eNBSourceCodePath=(.+)$', myArgv, re.IGNORECASE)
-            RAN.workspace=matchReg.group(1)
-            CONTAINERS.workspace=matchReg.group(1)
-            CLUSTER.workspace=matchReg.group(1)
+                RAN.eNBSourceCodePath=matchReg.group(1)
+                CONTAINERS.eNBSourceCodePath=matchReg.group(1)
+                CLUSTER.eNBSourceCodePath=matchReg.group(1)
+            elif re.match(r'^\-\-eNB1SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+                print("parameter --eNB1SourceCodePath ignored")
+            elif re.match(r'^\-\-eNB2SourceCodePath=(.+)$', myArgv, re.IGNORECASE):
+                print("parameter --eNB2SourceCodePath ignored")
         elif re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE):
             matchReg = re.match(r'^\-\-XMLTestFile=(.+)$', myArgv, re.IGNORECASE)
             CiTestObj.testXMLfiles.append(matchReg.group(1))

ci-scripts/ci_infra.yaml

@@ -79,19 +79,11 @@ oc-cn5g:
 
 oc-cn5g-20897:
   Host: cacofonix
-  NetworkScript: echo "inet 172.21.6.115"
+  NetworkScript: echo "inet 172.21.6.105"
   RunIperf3Server: False
-  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-00105:
-  Host: cacofonix
-  NetworkScript: echo "inet 172.21.6.118"
-  RunIperf3Server: False
-  Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72"
-  Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72"
-  LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2026-apr-00105 oaicicd-core-for-fhi72 %%log_dir%%"
+  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%%"
 
 oc-cn5g-00103-ho:
   Host: groot
@@ -191,16 +183,6 @@ amarisoft_ue_2x2:
   InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_aw2s_asue_20MHz_2x2/aw2s-multi-00102-2x2-v2.cfg &
   TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
   NetworkScript: ip netns exec ue1 ip a show dev pdn0
-amarisoft_00105_40MHz:
-  Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_40MHz/multi-00105-40.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
-amarisoft_00105_100MHz:
-  Host: amariue
-  InitScript: /root/lteue-linux-2025-03-15/lteue /root/oaicicd/ran_sa_fhi72_mplane_100MHz/multi-00105-100.cfg &
-  TermScript: /root/lteue-linux-2025-03-15/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
-  NetworkScript: ip netns exec ue1 ip a show dev pdn0
 amarisoft_ue_1:
   Host: amariue
   AttachScript: /root/lteue-linux-2025-03-15/ws.js 127.0.0.1:9002 '{"message":"power_on","ue_id":1}'

ci-scripts/cls_cluster.py

@@ -50,16 +50,17 @@ def OC_logout(cmd):
 
 class Cluster:
 	def __init__(self):
-		self.workspace = ""
+		self.eNBSourceCodePath = ""
 		self.OCUserName = ""
 		self.OCPassword = ""
 		self.OCProjectName = ""
 		self.OCUrl = OCUrl
 		self.OCRegistry = OCRegistry
-		self.repository = ""
-		self.branch = ""
-		self.merge = False
-		self.targetBranch = ""
+		self.ranRepository = ""
+		self.ranBranch = ""
+		self.ranCommitID = ""
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ""
 		self.cmd = None
 
 	def _recreate_entitlements(self):
@@ -100,7 +101,7 @@ class Cluster:
 	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.workspace} --exclude=""')
+		ret = self.cmd.run(f'oc start-build {name} --from-dir={self.eNBSourceCodePath} --exclude=""')
 		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
 		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
 			logging.error(f"error during oc start-build: {ret.stdout}")
@@ -156,7 +157,7 @@ class Cluster:
 				OC_logout(cmd)
 				HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 				return False
-			tag = self.branch
+			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
 			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, None, None)
 			OC_logout(cmd)
@@ -173,12 +174,12 @@ class Cluster:
 		return (image, archiveArtifact(self.cmd, ctx, fn))
 
 	def BuildClusterImage(self, ctx, node, HTML):
-		if self.repository == '' or self.branch == '':
+		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
 			HELP.GenericHelp(CONST.Version)
-			raise ValueError(f'Insufficient Parameter: repository {self.repository} branch {self.branch}')
-		lSourcePath = self.workspace
+			raise ValueError(f'Insufficient Parameter: ranRepository {self.ranRepository} ranBranch {ranBranch} ranCommitID {self.ranCommitID}')
+		lSourcePath = self.eNBSourceCodePath
 		if node == '' or lSourcePath == '':
-			raise ValueError('Insufficient Parameter: workspace missing')
+			raise ValueError('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
@@ -199,22 +200,22 @@ class Cluster:
 
 		baseTag = 'develop'
 		forceBaseImageBuild = False
-		if self.merge: # merging MR branch into develop -> temporary image
-			branchName = self.branch.replace('/','-')
-			imageTag = f'{branchName}'
-			if self.targetBranch == 'develop':
+		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
+			branchName = self.ranBranch.replace('/','-')
+			imageTag = f'{branchName}-{self.ranCommitID[0:8]}'
+			if self.ranTargetBranch == 'develop':
 				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel9 | grep --colour=never -i INDEX')
 				result = re.search('index', ret.stdout)
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.branch)
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
 			if not forceBaseImageBuild and result is not None:
 				forceBaseImageBuild = True
 				baseTag = 'ci-temp'
 		else:
-			imageTag = self.branch
+			imageTag = f'develop-{self.ranCommitID[0:8]}'
 			forceBaseImageBuild = True
 
 		# logging to OC Cluster and then switch to corresponding project

ci-scripts/cls_containerize.py

@@ -32,15 +32,35 @@ from cls_ci_helper import archiveArtifact
 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']
 DEFAULT_REGISTRY = "gracehopper3-oai.sboai.cs.eurecom.fr"
 
-def CreateWorkspace(host, sourcePath, repository, branch):
+def CreateWorkspace(host, sourcePath, ranRepository, ranCommitID, ranTargetBranch, ranAllowMerge):
+	if ranCommitID == '':
+		logging.error('need ranCommitID in CreateWorkspace()')
+		raise ValueError('Insufficient Parameter in CreateWorkspace(): need ranCommitID')
+
 	script = "scripts/create_workspace.sh"
-	options = f"{sourcePath} {repository} {branch}"
+	options = f"{sourcePath} {ranRepository} {ranCommitID}"
+	if ranAllowMerge:
+		if ranTargetBranch == '':
+			ranTargetBranch = 'develop'
+		options += f" {ranTargetBranch}"
 	logging.info(f'execute "{script}" with options "{options}" on node {host}')
 	with cls_cmd.getConnection(host) as c:
 		ret = c.exec_script(script, 90, options)
 	logging.debug(f'"{script}" finished with code {ret.returncode}, output:\n{ret.stdout}')
 	return ret.returncode == 0
 
+def CreateTag(ranCommitID, ranBranch, ranAllowMerge):
+	if ranCommitID == 'develop':
+		return 'develop'
+	shortCommit = ranCommitID[0:8]
+	if ranAllowMerge:
+		# Allowing contributor to have a name/branchName format
+		branchName = ranBranch.replace('/','-')
+		tagToUse = f'{branchName}-{shortCommit}'
+	else:
+		tagToUse = f'develop-{shortCommit}'
+	return tagToUse
+
 def AnalyzeBuildLogs(image, lf):
 	committed = False
 	tagged = False
@@ -152,12 +172,14 @@ class Containerize():
 
 	def __init__(self):
 		
-		self.repository = ''
-		self.branch = ''
-		self.merge = False
-		self.targetBranch = ''
-		self.workspace = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranAllowMerge = False
+		self.ranCommitID = ''
+		self.ranTargetBranch = ''
+		self.eNBSourceCodePath = ''
 		self.imageKind = ''
+		self.proxyCommit = None
 		self.yamlPath = ''
 		self.services = ''
 		self.deploymentTag = ''
@@ -171,7 +193,7 @@ class Containerize():
 #-----------------------------------------------------------
 
 	def BuildImage(self, ctx, node, HTML):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		log_files = []
@@ -227,16 +249,16 @@ class Containerize():
 		baseTag = 'develop'
 		forceBaseImageBuild = False
 		imageTag = 'develop'
-		if (self.merge):
+		if (self.ranAllowMerge):
 			imageTag = 'ci-temp'
-			if self.targetBranch == 'develop':
+			if self.ranTargetBranch == 'develop':
 				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{dockerfileprefix} | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
 			# if the branch name contains integration_20xx_wyy, let rebuild ran-base
-			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.branch)
+			result = re.search('integration_20([0-9]{2})_w([0-9]{2})', self.ranBranch)
 			if not forceBaseImageBuild and result is not None:
 				forceBaseImageBuild = True
 				baseTag = 'ci-temp'
@@ -354,8 +376,90 @@ class Containerize():
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 		return status
 
+	def BuildProxy(self, ctx, node, HTML):
+		lSourcePath = self.eNBSourceCodePath
+		logging.debug('Building on server: ' + node)
+		ssh = cls_cmd.getConnection(node)
+
+		oldRanCommidID = self.ranCommitID
+		oldRanRepository = self.ranRepository
+		oldRanAllowMerge = self.ranAllowMerge
+		oldRanTargetBranch = self.ranTargetBranch
+		self.ranCommitID = self.proxyCommit
+		self.ranRepository = 'https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy.git'
+		self.ranAllowMerge = False
+		self.ranTargetBranch = 'master'
+
+		# Let's remove any previous run artifacts if still there
+		ssh.run('docker image prune --force')
+		# Remove any previous proxy image
+		ssh.run('docker image rm oai-lte-multi-ue-proxy:latest')
+
+		tag = self.proxyCommit
+		logging.debug('building L2sim proxy image for tag ' + tag)
+		# check if the corresponding proxy image with tag exists. If not, build it
+		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+		buildProxy = ret.returncode != 0 # if no image, build new proxy
+		if buildProxy:
+			ssh.run(f'rm -Rf {lSourcePath}')
+			success = CreateWorkspace(node, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+			if not success:
+				raise Exception("could not clone proxy repository")
+
+			fullpath = f'{lSourcePath}/proxy_build.log'
+
+			ssh.run(f'docker build --target oai-lte-multi-ue-proxy --tag proxy:{tag} --file {lSourcePath}/docker/Dockerfile.ubuntu18.04 {lSourcePath} > {fullpath} 2>&1')
+			archiveArtifact(ssh, ctx, fullpath)
+
+			ssh.run('docker image prune --force')
+			ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+			if ret.returncode != 0:
+				logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
+				ssh.close()
+				HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
+				return False
+		else:
+			logging.debug('L2sim proxy image for tag ' + tag + ' already exists, skipping build')
+
+		# retag the build images to that we pick it up later
+		ssh.run(f'docker image tag proxy:{tag} oai-lte-multi-ue-proxy:latest')
+
+		# we assume that the host on which this is built will also run the proxy. The proxy
+		# currently requires the following command, and the docker-compose up mechanism of
+		# the CI does not allow to run arbitrary commands. Note that the following actually
+		# belongs to the deployment, not the build of the proxy...
+		logging.warning('the following command belongs to deployment, but no mechanism exists to exec it there!')
+		ssh.run('sudo ifconfig lo: 127.0.0.2 netmask 255.0.0.0 up')
+
+		# to prevent accidentally overwriting data that might be used later
+		self.ranCommitID = oldRanCommidID
+		self.ranRepository = oldRanRepository
+		self.ranAllowMerge = oldRanAllowMerge
+		self.ranTargetBranch = oldRanTargetBranch
+
+		ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
+		result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
+		# Cleaning any created tmp volume
+		ssh.run('docker volume prune --force')
+		ssh.close()
+
+		allImagesSize = {}
+		if result is not None:
+			imageSize = float(result.group('size')) / 1000000
+			logging.debug('\u001B[1m   proxy size is ' + ('%.0f' % imageSize) + ' Mbytes\u001B[0m')
+			allImagesSize['proxy'] = str(round(imageSize,1)) + ' Mbytes'
+			logging.info('\u001B[1m Building L2sim Proxy Image Pass\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'OK', CONST.ALL_PROCESSES_OK)
+			return True
+		else:
+			logging.error('proxy size is unknown')
+			allImagesSize['proxy'] = 'unknown'
+			logging.error('\u001B[1m Build of L2sim proxy failed\u001B[0m')
+			HTML.CreateHtmlTestRow('commit ' + tag, 'KO', CONST.ALL_PROCESSES_OK)
+			return False
+
 	def BuildRunTests(self, ctx, node, dockerfile, runtime_opt, ctest_opt, HTML):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Building on server: ' + node)
 		cmd = cls_cmd.getConnection(node)
 		cmd.cd(lSourcePath)
@@ -363,8 +467,8 @@ class Containerize():
 		# check that ran-base image exists as we expect it
 		baseImage = 'ran-base'
 		baseTag = 'develop'
-		if self.merge:
-			if self.targetBranch == 'develop':
+		if self.ranAllowMerge:
+			if self.ranTargetBranch == 'develop':
 				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.ubuntu | grep --colour=never -i INDEX')
 				result = re.search('index', cmd.getBefore())
 				if result is not None:
@@ -407,7 +511,7 @@ class Containerize():
 			return False
 
 	def Push_Image_to_Local_Registry(self, node, HTML, tag_prefix=""):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.debug('Pushing images to server: ' + node)
 		ssh = cls_cmd.getConnection(node)
 		imagePrefix = DEFAULT_REGISTRY
@@ -420,10 +524,10 @@ class Containerize():
 			return False
 
 		orgTag = 'develop'
-		if self.merge:
+		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
 		for image in IMAGES:
-			tagToUse = tag_prefix + self.branch
+			tagToUse = tag_prefix + CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			imageTag = f"{image}:{tagToUse}"
 			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')
 			if ret.returncode != 0:
@@ -436,7 +540,7 @@ class Containerize():
 				HTML.CreateHtmlTestRow(msg, 'KO', CONST.ALL_PROCESSES_OK)
 				return False
 			# Creating a develop tag on the local private registry
-			if not self.merge:
+			if not self.ranAllowMerge:
 				devTag = f"{tag_prefix}develop"
 				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:{devTag}')
 				ssh.run(f'docker push {imagePrefix}/{image}:{devTag}')
@@ -484,7 +588,7 @@ class Containerize():
 	def Pull_Image_from_Registry(self, HTML, node, images, tag=None, tag_prefix="", registry=DEFAULT_REGISTRY, username="oaicicd", password="oaicicd"):
 		logging.debug(f'\u001B[1m Pulling image(s) on server: {node}\u001B[0m')
 		if not tag:
-			tag = self.branch
+			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 		with cls_cmd.getConnection(node) as cmd:
 			success, msg = Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, username, password)
 		param = f"on node {node}"
@@ -497,7 +601,7 @@ class Containerize():
 	def Clean_Test_Server_Images(self, HTML, node, images, tag=None):
 		logging.debug(f'\u001B[1m Cleaning image(s) from server: {node}\u001B[0m')
 		if not tag:
-			tag = self.branch
+			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 
 		status = True
 		with cls_cmd.getConnection(node) as myCmd:
@@ -516,17 +620,17 @@ class Containerize():
 		return status
 
 	def Create_Workspace(self, node, HTML):
-		sourcePath = self.workspace
-		success = CreateWorkspace(node, sourcePath, self.repository, self.branch)
+		lSourcePath = self.eNBSourceCodePath
+		success = CreateWorkspace(node, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
 		if success:
-			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {sourcePath} on node {node}"])
+			HTML.CreateHtmlTestRowQueue('N/A', 'OK', [f"created workspace {lSourcePath}"])
 		else:
 			HTML.CreateHtmlTestRowQueue('N/A', 'KO', ["cannot create workspace"])
 		return success
 
 	def DeployObject(self, ctx, node, HTML):
 		num_attempts = self.num_attempts
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
@@ -544,7 +648,7 @@ class Containerize():
 				raise ValueError(f'Invalid value for num_attempts: {num_attempts}, must be greater than 0')
 			for attempt in range(num_attempts):
 				logging.info(f'will start services {services}')
-				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 120 -- {services}')
+				status = ssh.run(f'docker compose -f {wd_yaml} up -d --wait --wait-timeout 60 -- {services}')
 				info = ssh.run(f"docker compose -f {wd_yaml} ps --all --format=\'table {{{{.Service}}}} [{{{{.Image}}}}] {{{{.Status}}}}\' -- {services} | column -t")
 				deployed = status.returncode == 0
 				if not deployed:
@@ -570,7 +674,7 @@ class Containerize():
 		return deployed
 
 	def StopObject(self, ctx, node, HTML):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		if not self.services:
 			raise ValueError(f'no services provided')
 		logging.info(f'\u001B[1m Stopping objects "{self.services}" from server: {node}\u001B[0m')
@@ -599,7 +703,7 @@ class Containerize():
 		return success
 
 	def UndeployObject(self, ctx, node, HTML, to_analyze):
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		logging.info(f'\u001B[1m Undeploying all objects from server {node}\u001B[0m')
 		yaml = self.yamlPath.strip('/')
 		wd = f'{lSourcePath}/{yaml}'
@@ -637,7 +741,7 @@ class Containerize():
 	def AnalyzeRTStatsObject(self, HTML, node, ctx, thresholds, service=None):
 		logging.info(f'Analyzing realtime stats from server: {node}')
 		yaml = self.yamlPath.strip('/')
-		wd = f'{self.workspace}/{yaml}'
+		wd = f'{self.eNBSourceCodePath}/{yaml}'
 		wd_yaml = f'{wd}/docker-compose.y*ml'
 
 		with cls_cmd.getConnection(node) as cmd:

ci-scripts/cls_oai_html.py

@@ -33,9 +33,11 @@ class HTMLManagement():
 		self.htmlHeaderCreated = False
 		self.htmlFooterCreated = False
 
-		self.repository = ''
-		self.branch = ''
-		self.commitID = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranCommitID = ''
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ''
 
 		self.nbTestXMLfiles = 0
 		self.htmlTabRefs = []
@@ -94,18 +96,47 @@ class HTMLManagement():
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
 			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-cloud-upload"></span> GIT Repository </td>\n')
-			self.htmlFile.write('       <td><a href="' + self.repository + '">' + self.repository + '</a></td>\n')
+			self.htmlFile.write('       <td><a href="' + self.ranRepository + '">' + self.ranRepository + '</a></td>\n')
 			self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Test Branch </td>\n')
-			self.htmlFile.write('       <td>' + self.branch + '</td>\n')
+			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-wrench"></span> Job Trigger </td>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('       <td>Merge-Request</td>\n')
+			else:
+				self.htmlFile.write('       <td>Push to Branch</td>\n')
 			self.htmlFile.write('     </tr>\n')
-			commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.commitID, shell=True, universal_newlines=True)
-			commit_message = commit_message.strip()
 			self.htmlFile.write('     <tr>\n')
-			self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
-			self.htmlFile.write('       <td>' + commit_message + '</td>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-out"></span> Source Branch </td>\n')
+			else:
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tree-deciduous"></span> Branch</td>\n')
+			self.htmlFile.write('       <td>' + self.ranBranch + '</td>\n')
 			self.htmlFile.write('     </tr>\n')
+			self.htmlFile.write('     <tr>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Source Commit ID </td>\n')
+			else:
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-tag"></span> Commit ID </td>\n')
+			self.htmlFile.write('       <td>' + self.ranCommitID + '</td>\n')
+			self.htmlFile.write('     </tr>\n')
+			if self.ranAllowMerge != '' and self.ranCommitID != 'develop':
+				commit_message = subprocess.check_output("git log -n1 --pretty=format:\"%s\" " + self.ranCommitID, shell=True, universal_newlines=True)
+				commit_message = commit_message.strip()
+				self.htmlFile.write('     <tr>\n')
+				if (self.ranAllowMerge):
+					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Source Commit Message </td>\n')
+				else:
+					self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-comment"></span> Commit Message </td>\n')
+				self.htmlFile.write('       <td>' + commit_message + '</td>\n')
+				self.htmlFile.write('     </tr>\n')
+			if (self.ranAllowMerge):
+				self.htmlFile.write('     <tr>\n')
+				self.htmlFile.write('       <td bgcolor = "lightcyan" > <span class="glyphicon glyphicon-log-in"></span> Target Branch </td>\n')
+				if (self.ranTargetBranch == ''):
+					self.htmlFile.write('       <td>develop</td>\n')
+				else:
+					self.htmlFile.write('       <td>' + self.ranTargetBranch + '</td>\n')
+				self.htmlFile.write('     </tr>\n')
 			self.htmlFile.write('  </table>\n')
 
 			self.htmlFile.write('  <br>\n')

ci-scripts/cls_oaicitest.py

@@ -65,23 +65,6 @@ def Iperf_ComputeTime(args):
 		raise Exception('Iperf time not found!')
 	return int(result.group('iperf_time'))
 
-def Iperf_UpdateBindPort(opts, ueIP, idx):
-	# search if bind address present. Extract if yes, add if no.
-	bind_m = re.search(r'(-B|--bind)\s+(?P<ip>\d+\.\d+\.\d+\.\d+)', opts)
-	if bind_m:
-		bindIP = bind_m.group('ip')
-	else:
-		bindIP = ueIP
-		opts += f" -B {ueIP}"
-	# search if port present. Extract if yes, add if no.
-	port_m = re.search(r'(-p|--port)\s+(?P<port>\d+)', opts)
-	if port_m:
-		port = port_m.group('port')
-	else:
-		port = 5002 + idx
-		opts += f" -p {port}"
-	return bindIP, port, opts
-
 def convert_to_mbps(value, magnitude):
 	value = float(value)
 	if magnitude == 'K' or magnitude == 'k':
@@ -282,8 +265,12 @@ def Deploy_Physim(ctx, HTML, node, workdir, script, options):
 class OaiCiTest():
 	
 	def __init__(self):
-		self.repository = ''
-		self.branch = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranCommitID = ''
+		self.ranAllowMerge = False
+		self.ranTargetBranch = ''
+
 		self.testXMLfiles = []
 		self.ping_args = ''
 		self.ping_packetloss_threshold = ''
@@ -470,6 +457,7 @@ class OaiCiTest():
 		svrIP = cn.getIP()
 		if not svrIP:
 			return (False, f"Iperf server {cn.getName()} has no IP address")
+
 		iperf_opt = self.iperf_args
 		jsonReport = "--json"
 		serverReport = ""
@@ -483,11 +471,11 @@ class OaiCiTest():
 			# note: enable server report collection on the UE side, no need to store and collect server report separately on the server side
 			serverReport = "--get-server-output"
 		iperf_time = Iperf_ComputeTime(self.iperf_args)
-		bindIP, port, iperf_opt = Iperf_UpdateBindPort(iperf_opt, ueIP, idx)
 		# hack: the ADB UEs don't have iperf in $PATH, so we need to hardcode for the moment
 		iperf_ue = '/data/local/tmp/iperf3' if re.search('adb', ue.getName()) else 'iperf3'
-		ue_header = f'UE {ue.getName()} ({bindIP})'
+		ue_header = f'UE {ue.getName()} ({ueIP})'
 		with cls_cmd.getConnection(ue.getHost()) as cmd_ue, cls_cmd.getConnection(cn.getHost()) as cmd_svr:
+			port = 5002 + idx
 			# note: some core setups start an iperf3 server automatically, indicated in ci_infra by runIperf3Server: False`
 			t = iperf_time * 2.5
 			cmd_ue.run(f'rm {client_filename}', reportNonZero=False, silent=True)
@@ -498,7 +486,7 @@ class OaiCiTest():
 				if ret.returncode == 0:
 					logging.warning(f'Iperf3 server on port {port} detected and terminated')
 				cmd_svr.run(f'{cn.getCmdPrefix()} timeout -vk3 {t} iperf3 -s -B {svrIP} -p {port} -1 {jsonReport} >> /dev/null &', timeout=t)
-			client_ret = cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -c {svrIP} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t, reportNonZero=False)
+			cmd_ue.run(f'{ue.getCmdPrefix()} timeout -vk3 {t} {iperf_ue} -B {ueIP} -c {svrIP} -p {port} {iperf_opt} {jsonReport} {serverReport} -O 5 >> {client_filename}', timeout=t)
 			dest_filename = archiveArtifact(cmd_ue, ctx, client_filename)
 		if udpIperf:
 			status, msg = Iperf_analyzeV3UDP(dest_filename, self.iperf_bitrate_threshold, self.iperf_packetloss_threshold, target_bitrate)
@@ -507,10 +495,6 @@ class OaiCiTest():
 		else:
 			status, msg = Iperf_analyzeV3TCPJson(dest_filename, self.iperf_tcp_rate_target)
 
-		# add some diagnostic messages if the actual iperf command returned non-zero
-		if client_ret.returncode != 0:
-			msg = f'{msg}\nIperf client command failed on {bindIP} -> {svrIP}:{port} (return code: {client_ret.returncode})'
-
 		return (status, f'{ue_header}\n{msg}')
 
 	def Iperf(self, ctx, node, HTML, infra_file="ci_infra.yaml"):

ci-scripts/conf_files/enb.nsa.band7.25prb.usrpb200.conf

@@ -215,7 +215,6 @@ L1s =
 (
   {
     num_cc = 1;
-    prach_dtx_threshold = 200;
     tr_n_preference = "local_mac";
   }
 );

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          = 290;
-  pucch_TargetSNRx10          = 200;
+  pucch_RSSI_Threshold = -270;
+  pusch_RSSI_Threshold = -260;
+  pusch_TargetSNRx10          = 260; # 150;
+  pucch_TargetSNRx10          = 200; #200;
   dl_max_mcs = 28;
   ul_max_mcs = 28;
   ul_min_mcs = 9;

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.113"; });
+    amf_ip_address = ({ ipv4 = "172.21.6.103"; });
 
     NETWORK_INTERFACES :
     {

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         = 6;
+  att_rx         = 0;
   bands          = [77];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 71;

ci-scripts/conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf

@@ -1,262 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 05; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pdsch_AntennaPorts_N1 = 2;
-    maxMIMO_layers        = 4;
-    pusch_AntennaPorts    = 4;
-    do_CSIRS              = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3330.93 MHz
-      dl_absoluteFrequencyPointA                                    = 622062;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 106;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 28875; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 106;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 152;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 3;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = -10;
-  }
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.116"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.150";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.150";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 250;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 1000;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 100;
-  pucch0_dtx_threshold = 10;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 24;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 10;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0"); # one VF can be used as well
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_key_pair = ("/opt/oai-gnb/etc/id_rsa.pub", "/opt/oai-gnb/etc/id_rsa");
-  du_addr = ("00:11:22:33:44:66");
-  vlan_tag = (3); # only one needed if one VF configured
-  ru_username = ("oranbenetel");
-  ru_ip_addr = ("192.168.81.4");
-  fh_config = ({
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-  });
-};

ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.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          = 100;
+  pusch_TargetSNRx10          = 200;
   pucch_TargetSNRx10          = 200;
   ul_prbblack_SNR_threshold   = 10;
 }

ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml

@@ -207,40 +207,3 @@ channelmod:
      forgetfact: 0
      offset: 0
      ds_tdl: 0
-vrtsim:
-  role: server
-  # Channel mode: exactly one of the three modes below should be active.
-  #
-  # No channel - plain passthrough, no impairments:
-  # cirdb: 0
-  # chanmod: 0
-  #
-  # Built-in channel model defined in the channelmod: section above:
-  # chanmod: 1
-  # cirdb: 0
-  #
-  # External taps emitter publishing over a nanomsg socket.
-  # Requires a running emit_from_db.py and build with -DOAI_VRTSIM_TAPS_CLIENT=ON:
-  # cirdb: 0
-  # chanmod: 0
-  # taps-socket: "tcp://127.0.0.1:5555"
-  #
-  # In-process CIR database: reads precomputed 3GPP TDL taps directly from
-  # cir_db.bin. No external emitter required. Generate the database offline
-  # with cir_generator.py. Use cirdb-path to point to the directory containing
-  # cir_db.bin and cir_db.yaml.
-  cirdb_file: /cirdb/cir_db.bin
-  cirdb_yaml: /cirdb/cir_db.yaml  
-  #
-  # Per-UE channel configuration for multi-UE operation
-  ue_config:
-    - antennas: "2x2"   # NxM where N=UE-TX, M=gNB-TX; M must equal RU nb_tx
-      model_id: 0       # 0=TDL-A 1=TDL-B 2=TDL-C 3=TDL-D 4=TDL-E
-      ds_ns: 1.0        # RMS delay spread in ns
-      speed_mps: 1.5    # UE speed in m/s
-      # aoa_deg: 0.0    # angle of arrival in degrees; TDL-D/E only
-    - antennas: "1x2"   
-      model_id: 0
-      ds_ns: 1.0
-      speed_mps: 1.5
-      # aoa_deg: 0.0    

ci-scripts/conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf

@@ -1,260 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-Active_gNBs = ( "gNB-OAI");
-# Asn1_verbosity, choice in: none, info, annoying
-Asn1_verbosity = "none";
-
-gNBs =
-(
- {
-    ////////// Identification parameters:
-    gNB_ID    =  0xe00;
-    gNB_name  =  "gNB-OAI";
-
-    // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 05; mnc_length = 2; snssaiList = ( { sst = 1; }); });
-
-    nr_cellid = 1;
-
-    ////////// Physical parameters:
-
-    pdsch_AntennaPorts_XP = 2;
-    pusch_AntennaPorts    = 2;
-    do_CSIRS              = 1;
-
-    servingCellConfigCommon = (
-    {
- #spCellConfigCommon
-
-      physCellId                                                    = 0;
-#  downlinkConfigCommon
-    #frequencyInfoDL
-      # center frequency = 3350.01 MHz
-      # selected SSB frequency = 3349.92 MHz
-      absoluteFrequencySSB                                          = 623328;
-      dl_frequencyBand                                              = 78;
-      # frequency point A = 3300.87 MHz
-      dl_absoluteFrequencyPointA                                    = 620058;
-      #scs-SpecificCarrierList
-        dl_offstToCarrier                                           = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        dl_subcarrierSpacing                                        = 1;
-        dl_carrierBandwidth                                         = 273;
-     #initialDownlinkBWP
-      #genericParameters
-       initialDLBWPlocationAndBandwidth                             = 1099; #38.101-1 Table 5.3.2-1
-       #
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialDLBWPsubcarrierSpacing                               = 1;
-      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                          = 11;
-        initialDLBWPsearchSpaceZero                                 = 0;
-
-  #uplinkConfigCommon
-     #frequencyInfoUL
-      ul_frequencyBand                                              = 78;
-      #scs-SpecificCarrierList
-      ul_offstToCarrier                                             = 0;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      ul_subcarrierSpacing                                          = 1;
-      ul_carrierBandwidth                                           = 273;
-      pMax                                                          = 23;
-     #initialUplinkBWP
-      #genericParameters
-        initialULBWPlocationAndBandwidth                            = 1099;
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-        initialULBWPsubcarrierSpacing                               = 1;
-      #rach-ConfigCommon
-        #rach-ConfigGeneric
-          prach_ConfigurationIndex                                  = 152;
-#prach_msg1_FDM
-#0 = one, 1=two, 2=four, 3=eight
-          prach_msg1_FDM                                            = 0;
-          prach_msg1_FrequencyStart                                 = 0;
-          zeroCorrelationZoneConfig                                 = 0;
-          preambleReceivedTargetPower                               = -100;
-#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
-          preambleTransMax                                          = 8;
-#powerRampingStep
-# 0=dB0,1=dB2,2=dB4,3=dB6
-        powerRampingStep                                            = 3;
-#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
-#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
-#one (0..15) 4,8,12,16,...60,64
-        ssb_perRACH_OccasionAndCB_PreamblesPerSSB                   = 15;
-#ra_ContentionResolutionTimer
-#(0..7) 8,16,24,32,40,48,56,64
-        ra_ContentionResolutionTimer                                = 7;
-        rsrp_ThresholdSSB                                           = 19;
-#prach-RootSequenceIndex_PR
-#1 = 839, 2 = 139
-        prach_RootSequenceIndex_PR                                  = 2;
-        prach_RootSequenceIndex                                     = 1;
-        # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
-        #
-        msg1_SubcarrierSpacing                                      = 1,
-# restrictedSetConfig
-# 0=unrestricted, 1=restricted type A, 2=restricted type B
-        restrictedSetConfig                                         = 0,
-
-# this is the offset between the last PRACH preamble power and the Msg3 PUSCH, 2 times the field value in dB
-        msg3_DeltaPreamble                                          = 2;
-        p0_NominalWithGrant                                         = -96;
-
-# pucch-ConfigCommon setup :
-# pucchGroupHopping
-# 0 = neither, 1= group hopping, 2=sequence hopping
-        pucchGroupHopping                                           = 0;
-        hoppingId                                                   = 0;
-        p0_nominal                                                  = -96;
-
-      ssb_PositionsInBurst_Bitmap                                   = 0x1;
-
-# ssb_periodicityServingCell
-# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
-
-# dmrs_TypeA_position
-# 0 = pos2, 1 = pos3
-      dmrs_TypeA_Position                                           = 0;
-
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      subcarrierSpacing                                             = 1;
-
-
-  #tdd-UL-DL-ConfigurationCommon
-# subcarrierSpacing
-# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
-      referenceSubcarrierSpacing                                    = 1;
-      # pattern1
-      # dl_UL_TransmissionPeriodicity
-      # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
-      dl_UL_TransmissionPeriodicity                                 = 5;
-      nrofDownlinkSlots                                             = 3;
-      nrofDownlinkSymbols                                           = 6;
-      nrofUplinkSlots                                               = 1;
-      nrofUplinkSymbols                                             = 4;
-
-  ssPBCH_BlockPower                                                 = -11;
-  }
-  );
-
-
-    # ------- SCTP definitions
-    SCTP :
-    {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
-    };
-
-
-    ////////// AMF parameters:
-    amf_ip_address = ({ ipv4 = "172.21.6.116"; });
-
-    NETWORK_INTERFACES :
-    {
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "172.21.16.150";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "172.21.16.150";
-        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-    };
-  }
-);
-
-MACRLCs = (
-{
-  tr_s_preference             = "local_L1";
-  tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 200;
-  pucch_TargetSNRx10          = 200;
-  pusch_FailureThres          = 1000;
-}
-);
-
-L1s = (
-{
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 100;
-  pucch0_dtx_threshold = 10;
-  pusch_dtx_threshold = 10;
-  max_ldpc_iterations = 15;
-  tx_amp_backoff_dB = 12; # needs to match O-RU configuration
-  L1_rx_thread_core = 3;
-  L1_tx_thread_core = 4;
-  phase_compensation = 0; # needs to match O-RU configuration
-}
-);
-
-RUs = (
-{
-  local_rf       = "no";
-  nb_tx          = 2;
-  nb_rx          = 2;
-  att_tx         = 24;
-  att_rx         = 0;
-  bands          = [78];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 75;
-  sf_extension                  = 0;
-  eNB_instances  = [0];
-  ru_thread_core = 5;
-  sl_ahead       = 10;
-  tr_preference  = "raw_if4p5"; # important: activate FHI7.2
-  do_precoding   = 0; # needs to match O-RU configuration
-}
-);
-
-security = {
-  # preferred ciphering algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nea0, nea1, nea2, nea3
-  ciphering_algorithms = ( "nea0" );
-
-  # preferred integrity algorithms
-  # the first one of the list that an UE supports in chosen
-  # valid values: nia0, nia1, nia2, nia3
-  integrity_algorithms = ( "nia2", "nia0" );
-
-  # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
-  # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
-  drb_ciphering = "yes";
-  drb_integrity = "no";
-};
-
-log_config :
-{
-  global_log_level = "info";
-  hw_log_level     = "info";
-  phy_log_level    = "info";
-  mac_log_level    = "info";
-  rlc_log_level    = "info";
-  pdcp_log_level   = "info";
-  rrc_log_level    = "info";
-  ngap_log_level   = "info";
-  f1ap_log_level   = "info";
-};
-
-fhi_72 = {
-  dpdk_devices = ("0000:c3:11.0"); # one VF can be used as well
-  system_core = 0;
-  io_core = 1;
-  worker_cores = (2);
-  du_key_pair = ("/opt/oai-gnb/etc/id_rsa.pub", "/opt/oai-gnb/etc/id_rsa");
-  du_addr = ("00:11:22:33:44:66");
-  vlan_tag = (3); # only one needed if one VF configured
-  ru_username = ("oranbenetel");
-  ru_ip_addr = ("192.168.81.4");
-  fh_config = ({
-    T1a_cp_dl = (419, 470);
-    T1a_cp_ul = (285, 336);
-    T1a_up = (294, 345);
-    Ta4 = (0, 200);
-  });
-};

ci-scripts/conf_files/nrue.uicc.2pdu.conf

@@ -5,8 +5,8 @@ uicc0 = {
   key = "fec86ba6eb707ed08905757b1bb44b8f";
   opc= "C42449363BBAD02B66D16BC975D77CC1";
   pdu_sessions = (
-    { id = 1; dnn = "oai"; nssai_sst = 1; nssai_sd = 0xFFFFFF; },
-    { id = 2; dnn = "openairinterface"; nssai_sst = 1; nssai_sd = 0x123456; }
+    { id = 1; dnn = "oai"; nssai_sst = 1; },
+    { id = 2; dnn = "oai"; nssai_sst = 1; }
   )
 }
 

ci-scripts/conf_files/nrue.uicc.yaml

@@ -30,7 +30,7 @@ channelmod:
     - model_name: rfsimu_channel_ue0
       type: AWGN
       ploss_dB: 20
-      noise_power_dB: -2
+      nose_power_dB: -2
       forgetfact: 0
       offset: 0
       ds_tdl: 0

ci-scripts/doGitLabMerge.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+# SPDX-License-Identifier: LicenseRef-CSSL-1.0
+
+function usage {
+    echo "OAI GitLab merge request applying script"
+    echo ""
+    echo "Usage:"
+    echo "------"
+    echo ""
+    echo "    doGitLabMerge.sh [OPTIONS] [MANDATORY_OPTIONS]"
+    echo ""
+    echo "Mandatory Options:"
+    echo "------------------"
+    echo ""
+    echo "    --src-branch #### OR -sb ####"
+    echo "    Specify the source branch of the merge request."
+    echo ""
+    echo "    --src-commit #### OR -sc ####"
+    echo "    Specify the source commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "    --target-branch #### OR -tb ####"
+    echo "    Specify the target branch of the merge request (usually develop)."
+    echo ""
+    echo "    --target-commit #### OR -tc ####"
+    echo "    Specify the target commit ID (SHA-1) of the merge request."
+    echo ""
+    echo "Options:"
+    echo "--------"
+    echo "    --help OR -h"
+    echo "    Print this help message."
+    echo ""
+}
+
+if [ $# -ne 8 ] && [ $# -ne 1 ]
+then
+    echo "Syntax Error: not the correct number of arguments"
+    echo ""
+    usage
+    exit 1
+fi
+
+checker=0
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    shift
+    usage
+    exit 0
+    ;;
+    -sb|--src-branch)
+    SOURCE_BRANCH="$2"
+    let "checker|=0x1"
+    shift
+    shift
+    ;;
+    -sc|--src-commit)
+    SOURCE_COMMIT_ID="$2"
+    let "checker|=0x2"
+    shift
+    shift
+    ;;
+    -tb|--target-branch)
+    TARGET_BRANCH="$2"
+    let "checker|=0x4"
+    shift
+    shift
+    ;;
+    -tc|--target-commit)
+    TARGET_COMMIT_ID="$2"
+    let "checker|=0x8"
+    shift
+    shift
+    ;;
+    *)
+    echo "Syntax Error: unknown option: $key"
+    echo ""
+    usage
+    exit 1
+esac
+
+done
+
+if [[ $TARGET_COMMIT_ID == "latest" ]]
+then
+    TARGET_COMMIT_ID=`git log -n1 --pretty=format:%H origin/$TARGET_BRANCH`
+fi
+
+echo "Source Branch is    : $SOURCE_BRANCH"
+echo "Source Commit ID is : $SOURCE_COMMIT_ID"
+echo "Target Branch is    : $TARGET_BRANCH"
+echo "Target Commit ID is : $TARGET_COMMIT_ID"
+
+if [ $checker -ne 15 ]
+then
+    echo ""
+    echo "Syntax Error: missing option"
+    echo ""
+    usage
+    exit 1
+fi
+
+git config user.email "jenkins@openairinterface.org"
+git config user.name "OAI Jenkins"
+
+git checkout -f $SOURCE_COMMIT_ID > checkout.txt 2>&1
+STATUS=`grep -E -c "fatal: reference is not a tree" checkout.txt`
+rm -f checkout.txt
+if [ $STATUS -ne 0 ]
+then
+    echo "fatal: reference is not a tree --> $SOURCE_COMMIT_ID"
+    STATUS=-1
+    exit $STATUS
+fi
+
+git merge --ff $TARGET_COMMIT_ID -m "Temporary merge for CI"
+
+STATUS=`git status | grep -E -c "You have unmerged paths.|fix conflicts"`
+if [ $STATUS -ne 0 ]
+then
+    echo "There are merge conflicts.. Cannot perform further build tasks"
+    STATUS=-1
+fi
+exit $STATUS

ci-scripts/docker/Dockerfile.channelsim.ubuntu

@@ -26,7 +26,7 @@ RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
         -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
         -DPHYSIM_CHECK_FILES="ThresholdsCuda.cmake" \
-        -DENABLE_CHANNEL_SIM_CUDA=ON \
+        -DCUDA_ENABLE=ON \
         -DUSE_UNIFIED_MEMORY=ON \
         -DUSE_ATS_MEMORY=OFF \
         -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \

ci-scripts/docker/Dockerfile.physim.cuda.ubuntu

@@ -26,7 +26,7 @@ RUN cmake -GNinja -DENABLE_PHYSIM_TESTS=ON -DENABLE_TESTS=ON \
         -DSANITIZE_UNDEFINED=OFF -DSANITIZE_ADDRESS=OFF \
         -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror \
         -DPHYSIM_CHECK_FILES="ThresholdsCuda.cmake" \
-        -DENABLE_CHANNEL_SIM_CUDA=ON \
+        -DCUDA_ENABLE=ON \
         -DUSE_UNIFIED_MEMORY=ON \
         -DUSE_ATS_MEMORY=OFF \
         -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=/oai-ran/cmake_targets/ran_build/build \

ci-scripts/docker/Dockerfile.unittest.cuda.ubuntu

@@ -22,4 +22,4 @@ WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DENABLE_CHANNEL_SIM_CUDA=ON .. && ninja tests
+RUN cmake -GNinja -DENABLE_TESTS=ON -DCUDA_ENABLE=ON .. && ninja tests

ci-scripts/docker/Dockerfile.unittest.ubuntu

@@ -13,12 +13,11 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         libgtest-dev \
-        libyaml-cpp-dev \
-        libzmq3-dev
+        libyaml-cpp-dev
 
 RUN rm -Rf /oai-ran
 WORKDIR /oai-ran
 COPY . .
 
 WORKDIR /oai-ran/build
-RUN cmake -GNinja -DENABLE_TESTS=ON -DOAI_ZMQ=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja
+RUN cmake -GNinja -DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DSANITIZE_ADDRESS=True .. && ninja tests

ci-scripts/helpreadme.py

@@ -28,15 +28,16 @@ def GenericHelp(vers):
 	print('          images are available locally, will not remove any images and will run inside the current repo directory')
 
 def GitSrvHelp(repository,branch,commit,mergeallow,targetbranch):
-	print('  --repository=[OAI RAN Repository URL]                                      -- ' + repository)
-	print('  --branch=[OAI RAN Repository Branch]                                       -- ' + branch)
-	print('  --commitID=[OAI RAN Repository Commit SHA-1]                               -- ' + commit)
+	print('  --ranRepository=[OAI RAN Repository URL]                                      -- ' + repository)
+	print('  --ranBranch=[OAI RAN Repository Branch]                                       -- ' + branch)
+	print('  --ranCommitID=[OAI RAN Repository Commit SHA-1]                               -- ' + commit)
 	print('  --ranAllowMerge=[Allow Merge Request (with target branch) (true or false)]    -- ' + mergeallow)
-	print('  --targetBranch=[Target Branch in case of a Merge Request]                  -- ' + targetbranch)
+	print('  --ranTargetBranch=[Target Branch in case of a Merge Request]                  -- ' + targetbranch)
 
-def SrvHelp(sourcepath):
-	print('  --workspace=[directory for workspaces on remote hosts]            -- ' + sourcepath)
+def eNBSrvHelp(sourcepath):
+	print('  --eNBSourceCodePath=[eNB\'s Source Code Path]            -- ' + sourcepath)
 
 def XmlHelp(filename):
 	print('  --XMLTestFile=[XML Test File to be run]                  -- ' + filename)
 	print('	Note: multiple xml files can be specified (--XMLFile=File1 ... --XMLTestFile=FileN) when HTML headers are created ("InitiateHtml" mode)')
+

ci-scripts/main.py

@@ -65,16 +65,21 @@ def ExecuteActionWithParam(action, ctx, node):
 	global HTML
 	global CONTAINERS
 	global CLUSTER
-	if action == 'Build_eNB' or action == 'Build_Image' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
+	if action == 'Build_eNB' or action == 'Build_Image' or action == 'Build_Proxy' or action == "Build_Cluster_Image" or action == "Build_Run_Tests":
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		CONTAINERS.imageKind=test.findtext('kind')
+		proxy_commit = test.findtext('proxy_commit')
 		dockerfile = test.findtext('dockerfile') or ''
 		runtime_opt = test.findtext('runtime-opt') or ''
 		ctest_opt = test.findtext('ctest-opt') or ''
+		if proxy_commit is not None:
+			CONTAINERS.proxyCommit = proxy_commit
 		if action == 'Build_eNB':
-			success = cls_native.Native.Build(ctx, node, HTML, RAN.workspace, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
 			success = CONTAINERS.BuildImage(ctx, node, HTML)
+		elif action == 'Build_Proxy':
+			success = CONTAINERS.BuildProxy(ctx, node, HTML)
 		elif action == 'Build_Cluster_Image':
 			success = CLUSTER.BuildClusterImage(ctx, node, HTML)
 		elif action == 'Build_Run_Tests':
@@ -148,16 +153,16 @@ def ExecuteActionWithParam(action, ctx, node):
 	elif action == 'Deploy_Run_OC_PhySim':
 		oc_release = test.findtext('oc_release')
 		script = "scripts/oc-deploy-physims.sh"
-		image_tag = CLUSTER.branch
-		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.workspace}"
-		workdir = CLUSTER.workspace
+		image_tag = cls_containerize.CreateTag(CLUSTER.ranCommitID, CLUSTER.ranBranch, CLUSTER.ranAllowMerge)
+		options = f"oaicicd-core-for-ci-ran {oc_release} {image_tag} {CLUSTER.eNBSourceCodePath}"
+		workdir = CLUSTER.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'Build_Deploy_PhySim':
 		ctest_opt = test.findtext('ctest-opt') or ''
 		script = test.findtext('script')
-		options = f"{CONTAINERS.workspace} {ctest_opt}"
-		workdir = CONTAINERS.workspace
+		options = f"{CONTAINERS.eNBSourceCodePath} {ctest_opt}"
+		workdir = CONTAINERS.eNBSourceCodePath
 		success = cls_oaicitest.Deploy_Physim(ctx, HTML, node, workdir, script, options)
 
 	elif action == 'DeployCoreNetwork' or action == 'UndeployCoreNetwork':
@@ -169,7 +174,7 @@ def ExecuteActionWithParam(action, ctx, node):
 		CONTAINERS.yamlPath = test.findtext('yaml_path')
 		CONTAINERS.services = test.findtext('services')
 		CONTAINERS.num_attempts = int(test.findtext('num_attempts') or 1)
-		CONTAINERS.deploymentTag = CONTAINERS.branch
+		CONTAINERS.deploymentTag = cls_containerize.CreateTag(CONTAINERS.ranCommitID, CONTAINERS.ranBranch, CONTAINERS.ranAllowMerge)
 		if action == 'Deploy_Object':
 			success = CONTAINERS.DeployObject(ctx, node, HTML)
 		elif action == 'Stop_Object':
@@ -190,7 +195,7 @@ def ExecuteActionWithParam(action, ctx, node):
 			success = CONTAINERS.Create_Workspace(node, HTML)
 
 	elif action == 'LicenceAndFormattingCheck':
-		success = SCA.StaticCodeAnalysis.LicenceAndFormattingCheck(ctx, node, HTML, RAN.workspace, RAN.branch, RAN.merge, RAN.targetBranch)
+		success = SCA.StaticCodeAnalysis.LicenceAndFormattingCheck(ctx, node, HTML, RAN.eNBSourceCodePath, RAN.ranBranch, RAN.ranAllowMerge, RAN.ranTargetBranch)
 
 	elif action == 'Push_Local_Registry':
 		tag_prefix = test.findtext('tag_prefix') or ""
@@ -214,14 +219,14 @@ def ExecuteActionWithParam(action, ctx, node):
 	elif action == 'Custom_Command':
 		command = test.findtext('command')
 		# Allow referencing repository workspace path in XML via %%workspace%%
-		command = command.replace("%%workspace%%", CONTAINERS.workspace)
+		command = command.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Command(HTML, node, command)
 
 	elif action == 'Custom_Script':
 		script = test.findtext('script')
 		args = test.findtext('args')
 		# Allow referencing repository workspace path in XML via %%workspace%%
-		script = script.replace("%%workspace%%", CONTAINERS.workspace)
+		script = script.replace("%%workspace%%", CONTAINERS.eNBSourceCodePath)
 		success = cls_oaicitest.Custom_Script(HTML, node, script, args)
 
 	elif action == 'Pull_Cluster_Image':
@@ -365,15 +370,15 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	logging.info('\u001B[1m  Starting Scenario: ' + CiTestObj.testXMLfiles[0] + '\u001B[0m')
 	logging.info('\u001B[1m----------------------------------------\u001B[0m')
 	if re.match('^TesteNB$', mode, re.IGNORECASE):
-		if RAN.repository == '' or RAN.branch == '' or RAN.workspace == '':
+		if RAN.ranRepository == '' or RAN.ranBranch == '' or RAN.eNBSourceCodePath == '':
 			HELP.GenericHelp(CONST.Version)
-			if RAN.repository == '':
-				HELP.GitSrvHelp(RAN.repository, RAN.branch, RAN.merge, RAN.targetBranch)
-			if RAN.workspace == '':
-				HELP.SrvHelp(RAN.workspace)
+			if RAN.ranRepository == '':
+				HELP.GitSrvHelp(RAN.ranRepository, RAN.ranBranch, RAN.ranCommitID, RAN.ranAllowMerge, RAN.ranTargetBranch)
+			if RAN.eNBSourceCodePath == '':
+				HELP.eNBSrvHelp(RAN.eNBSourceCodePath)
 			sys.exit('Insufficient Parameter')
 	else:
-		if CiTestObj.repository == '' or CiTestObj.branch == '':
+		if CiTestObj.ranRepository == '' or CiTestObj.ranBranch == '':
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('UE: Insufficient Parameter')
 

ci-scripts/pre-ci-check.sh

@@ -1,96 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-function usage {
-    echo "OAI GitLab MR validation script (Signed-off-by and merge commits)"
-    echo ""
-    echo "Usage:"
-    echo "------"
-    echo "    $0 -s <source-branch> -t <target-branch>"
-    echo ""
-    echo "Options:"
-    echo "--------"
-    echo "    -s"
-    echo "    The source branch of the merge request. Default value is current Git Branch (HEAD)"
-    echo ""
-    echo "    -t"
-    echo "    The target branch of the merge request. Default value is develop"
-    echo ""
-    echo "    -h"
-    echo "    Print this help message."
-    echo ""
-}
-
-# Parse arguments properly
-SOURCE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-TARGET_BRANCH="origin/develop"
-
-git fetch --quiet
-
-while getopts ":s:t:h" opt; do
-    case "$opt" in
-        s)
-            SOURCE_BRANCH="$OPTARG"
-            ;;
-        t)
-            TARGET_BRANCH="$OPTARG"
-            ;;
-        h)
-            usage
-            exit 0
-            ;;
-        :)
-            echo "Error: Option -$OPTARG requires a value."
-            echo ""
-            usage
-            exit 2
-            ;;
-        \?)
-            echo "Error: Invalid option -$OPTARG"
-            echo ""
-            usage
-            exit 2
-            ;;
-    esac
-done
-
-# ----------------------------
-# Merged commits
-# ----------------------------
-mergeCommits=$(git rev-list --merges --abbrev-commit "$TARGET_BRANCH".."$SOURCE_BRANCH")
-if [[ ! "$SOURCE_BRANCH" =~ ^(origin/)?integration_[0-9]{4}_w[0-9]{2}$ ]]; then
-    if [[ -n "$mergeCommits" ]]; then
-        message="> ERROR: Following merge commits are found in the source branch history. Please rebase your branch.\n>\n"
-        message+="> $(echo "$mergeCommits" | paste -sd ',' -)\n"
-        echo -e "$message"
-        exit 3
-    fi
-fi
-
-# ----------------------------
-# Check unsigned commits
-# ----------------------------
-unsignedCommits=$(
-    for c in $(git rev-list "$TARGET_BRANCH".."$SOURCE_BRANCH" --no-merges); do
-        if ! git log -1 --format=%B "$c" | grep -q "Signed-off-by:"; then
-            git log -1 --format='%h' "$c"
-        fi
-    done | paste -sd ","
-)
-
-# ----------------------------
-# Report unsigned commits
-# ----------------------------
-message=""
-
-if [ -n "$unsignedCommits" ]; then
-    message="> WARNING: The following commit(s) are missing a Signed-off-by:\n>\n> $unsignedCommits\n>\n"
-    message+="> Please use 'git commit -s' to sign your commits.\n>\n"
-    message+="> For detailed instructions, refer to the CONTRIBUTING file at the root of this repository."
-    echo -e "$message"
-    exit 1
-else
-    message="> All commits are signed off using 'git commit -s'."
-    echo -e "$message"
-    exit 0
-fi

ci-scripts/ran.py

@@ -32,11 +32,12 @@ class RANManagement():
 
 	def __init__(self):
 		
-		self.repository = ''
-		self.branch = ''
-		self.merge = False
-		self.targetBranch = ''
-		self.workspace = ''
+		self.ranRepository = ''
+		self.ranBranch = ''
+		self.ranAllowMerge = False
+		self.ranCommitID = ''
+		self.ranTargetBranch = ''
+		self.eNBSourceCodePath = ''
 		self.Initialize_eNB_args = ''
 		self.imageKind = ''
 		self.eNBOptions = ['', '', '']
@@ -56,7 +57,7 @@ class RANManagement():
 			raise ValueError(f"{node=}")
 		logging.debug('Starting eNB/gNB on server: ' + node)
 
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		cmd = cls_cmd.getConnection(node)
 		
 		# Initialize_eNB_args usually start with -O and followed by the location in repository
@@ -102,7 +103,7 @@ class RANManagement():
 
 	def TerminateeNB(self, ctx, node, HTML, to_analyze):
 		logging.debug('Stopping eNB/gNB on server: ' + node)
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 		cmd = cls_cmd.getConnection(node)
 		ret = cmd.run('ps -aux | grep --color=never -e softmodem | grep -v grep')
 		result = re.search('-softmodem', ret.stdout)
@@ -137,7 +138,7 @@ class RANManagement():
 
 	def AnalyzeRTStats(self, HTML, node, ctx, thresholds):
 		logging.info(f'Analyzing realtime stats from server: {node}')
-		lSourcePath = self.workspace
+		lSourcePath = self.eNBSourceCodePath
 
 		logdir = f'{lSourcePath}/cmake_targets'
 		with cls_cmd.getConnection(node) as cmd:

ci-scripts/run_locally.sh

@@ -30,13 +30,15 @@ docker tag oai-nr-ue oai-ci/oai-nr-ue:develop-${SHORT_COMMIT_SHA}
 docker tag oai-gnb oai-ci/oai-gnb:develop-${SHORT_COMMIT_SHA}
 docker tag oai-nr-cuup oai-ci/oai-nr-cuup:develop-${SHORT_COMMIT_SHA}
 
-python3 main.py --mode=InitiateHtml --repository=NONE --branch=${CURRENT_BRANCH} \
+python3 main.py --mode=InitiateHtml --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
+    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
+    --ranTargetBranch=NONE \
     --XMLTestFile=xml_files/${TESTCASE} --local --datefmt="%H:%M:%S"
 
-python3 main.py --mode=TesteNB --repository=NONE --branch=${CURRENT_BRANCH} \
-    --ranAllowMerge=false \
-    --targetBranch=NONE \
-    --workspace=${REPO_PATH} \
+python3 main.py --mode=TesteNB --ranRepository=NONE --ranBranch=${CURRENT_BRANCH} \
+    --ranCommitID=${COMMIT_SHA} --ranAllowMerge=false \
+    --ranTargetBranch=NONE \
+    --eNBSourceCodePath=${REPO_PATH} \
     --XMLTestFile=${TESTCASE} --local --datefmt="%H:%M:%S"
 RET=$?
 

ci-scripts/scripts/create_workspace.sh

@@ -6,16 +6,22 @@ function die() {
   exit 1
 }
 
-[ $# -eq 3 ] || die "usage: $0 <directory> <repository> <branch>"
+[ $# -ge 3 -a $# -le 4 ] || die "usage: $0 <directory> <repository> <ref> [<merge-ref>]"
 
 set -ex
 
 dir=$1
 repo=$2
-branch=$3
+ref=$3
+merge=$4
 
 rm -rf ${dir}
-git clone --depth=1 --branch "${branch}" "${repo}" "${dir}"
+git clone --filter=blob:none -n ${repo} ${dir}
 cd ${dir}
+git config user.email "jenkins@openairinterface.org"
+git config user.name "OAI Jenkins"
+git config advice.detachedHead false
 mkdir -p cmake_targets/log
+git checkout -f ${ref}
+[ -n "${merge}" ] && git fetch origin ${merge} && git merge --ff FETCH_HEAD -m "Temporary merge for CI"
 exit 0

ci-scripts/scripts/vvdn-activate-carriers.sh

@@ -1,48 +0,0 @@
-#!/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 $@ </dev/null
-}
-
-echo "→ Checking for PTP fluctuations in the last 60 minutes..."
-
-logs=$(journalctl -u ptp4l.service --since "60 minutes ago")
-
-check_ptp=$(echo "$logs" | awk '
-/rms/ {
-    rms=$8
-    if (rms > 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 "<active>INACTIVE</active>"'; then
-    echo "→ Some carriers are not active, activating via sysrepocfg..."
-    ssh_exec 'sysrepocfg -X -d running -f xml | sed "s/<active>INACTIVE<\/active>/<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

ci-scripts/scripts/vvdn-inactivate-carriers.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: MIT
-
-set -e
-
-RU_HOST="root@10.10.0.111"
-
-ssh_exec() {
-    ssh $RU_HOST $@ </dev/null
-}
-
-echo "→ Inactivating TX/RX carriers on VVDN LPRU..."
-ssh_exec 'sysrepocfg -X -d running -f xml | sed "s/ACTIVE/INACTIVE/g" | sysrepocfg -I -d running -f xml'
-echo "✓ TX/RX carriers inactivated."

ci-scripts/tests/build.py

@@ -24,7 +24,7 @@ class TestBuild(unittest.TestCase):
 		self._d = tempfile.mkdtemp()
 		logging.warning(f"temporary directory: {self._d}")
 		self.node = 'localhost'
-		self.cont.workspace = self._d
+		self.cont.eNBSourceCodePath = self._d
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
 
 	def tearDown(self):
@@ -33,5 +33,10 @@ class TestBuild(unittest.TestCase):
 			cmd.run(f"rm -rf {self._d}")
 			cmd.run(f'rm -rf {self.ctx.logPath}')
 
+	def test_build_proxy(self):
+		self.cont.proxyCommit = "b64d9bce986b38ca59e8582864ade3fcdd05c0dc"
+		success = self.cont.BuildProxy(self.ctx, self.node, self.html)
+		self.assertTrue(success)
+
 if __name__ == '__main__':
 	unittest.main()

ci-scripts/tests/deployment.py

@@ -41,9 +41,10 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.cont = cls_containerize.Containerize()
 		self.cont.yamlPath = ''
-		self.cont.merge = True
-		self.cont.branch = ''
-		self.cont.workspace = os.getcwd()
+		self.cont.ranAllowMerge = True
+		self.cont.ranBranch = ''
+		self.cont.ranCommitID = ''
+		self.cont.eNBSourceCodePath = os.getcwd()
 		self.cont.num_attempts = 3
 		self.node = 'localhost'
 		self.ctx = TestCaseCtx.Default(tempfile.mkdtemp())
@@ -135,12 +136,13 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.assertTrue(undeploy)
 
 	def test_create_workspace(self):
-		self.cont.workspace = tempfile.mkdtemp()
-		self.cont.repository = "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
-		self.cont.branch = "develop"
+		self.cont.eNBSourceCodePath = tempfile.mkdtemp()
+		self.cont.ranRepository = "https://gitlab.eurecom.fr/oai/openairinterface5g.git"
+		self.cont.ranCommitID = "05f9c975eeecbca1bdff5940affad44465f1301f"
+		self.cont.ranBranch = "develop"
 		ws = self.cont.Create_Workspace(self.node, self.html)
 		with cls_cmd.LocalCmd() as cmd:
-			cmd.run(f"rm -rf {self.cont.workspace}")
+			cmd.run(f"rm -rf {self.cont.eNBSourceCodePath}")
 		self.assertTrue(ws)
 
 	def test_undeploy_loganalysis(self):

ci-scripts/tests/ping-iperf.py

@@ -82,17 +82,5 @@ class TestPingIperf(unittest.TestCase):
 		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
 		self.assertTrue(success)
 
-	def test_iperf_new_bindport(self):
-		self.ci.iperf_args = "-u -t 5 -b 22M -O 0 -p 10000 -B 127.0.0.3"
-		self.ci.svr_id = "test"
-		self.ci.svr_node = "localhost"
-		self.ci.iperf_packetloss_threshold = "0"
-		self.ci.iperf_bitrate_threshold = "0"
-		self.ci.iperf_profile = "balanced"
-		infra_file = "tests/config/infra_ping_iperf.yaml"
-		# TODO Should need nothing but options and UE(s) to use
-		success = self.ci.Iperf(self.ctx, self.node, self.html, infra_file=infra_file)
-		self.assertTrue(success)
-
 if __name__ == '__main__':
 	unittest.main()

ci-scripts/tests/pull-clean-int-registry.py

@@ -22,7 +22,7 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.html = cls_oai_html.HTMLManagement()
 		self.html.testCaseId = "000000"
 		self.cont = cls_containerize.Containerize()
-		self.cont.workspace = os.getcwd()
+		self.cont.eNBSourceCodePath = os.getcwd()
 
 	def test_pull_clean_local_reg(self):
 		# the pull function has the authentication at the internal cluster hardcoded

ci-scripts/tests/test-runner/run.sh

@@ -9,17 +9,21 @@ rm -f ${file}
 cd ../../
 python3 main.py \
   --mode=InitiateHtml \
-  --repository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
-  --branch=${branch} \
+  --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
+  --ranBranch=${branch} \
+  --ranCommitID=${commit} \
+  --ranAllowMerge=true \
+  --ranTargetBranch=develop \
   --XMLTestFile=tests/test-runner/test.xml
 
 python3 main.py \
   --mode=TesteNB \
-  --repository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
-  --branch=${branch} \
+  --ranRepository=https://gitlab.eurecom.fr/oai/openairinterface5g.git \
+  --ranBranch=${branch} \
+  --ranCommitID=${commit} \
   --ranAllowMerge=true \
-  --targetBranch=develop \
-  --workspace=NONE \
+  --ranTargetBranch=develop \
+  --eNBSourceCodePath=NONE \
   --XMLTestFile=tests/test-runner/test.xml
 
 python3 main.py \

ci-scripts/xml_class_list.yml

@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
+  - Build_Proxy
   - Build_Cluster_Image
   - Pull_Cluster_Image
   - Build_eNB

ci-scripts/xml_files/container_5g_rfsim_n2_ho.xml

@@ -41,17 +41,6 @@
     <node>localhost</node>
   </testCase>
 
-  <testCase>
-    <class>Ping</class>
-    <desc>UL ping ext-dn from NR-UE</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i0.5</ping_args>
-    <ping_packetloss_threshold>80</ping_packetloss_threshold>
-  </testCase>
-
   <testCase>
     <class>Ping</class>
     <desc>Ping NR-UE from ext-dn</desc>

ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml

@@ -23,7 +23,7 @@
     <desc>Deploy OAI 5G CoreNetwork</desc>
     <node>localhost</node>
     <yaml_path>ci-scripts/yaml_files/5g_rfsimulator_u0_25prb</yaml_path>
-    <services>mysql oai-amf oai-smf oai-pcf oai-upf oai-ext-dn</services>
+    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
   </testCase>
 
   <testCase>
@@ -41,6 +41,28 @@
     <node>localhost</node>
   </testCase>
 
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE</desc>
+    <id>rfsim5g_ue</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ext_dn</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
+  <testCase>
+    <class>Ping</class>
+    <desc>Ping NR-UE from ext-dn</desc>
+    <id>rfsim5g_ext_dn</id>
+    <node>localhost</node>
+    <svr_id>rfsim5g_ue</svr_id>
+    <svr_node>localhost</svr_node>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
+  </testCase>
+
   <testCase>
     <class>Attach_UE</class>
     <desc>Verify 2nd PDU session is up</desc>
@@ -49,109 +71,14 @@
   </testCase>
 
   <testCase>
-    <class>Custom_Command</class>
-    <desc>Configure policy routing for PDU2 source IP</desc>
-    <may_fail>true</may_fail>
-    <node>localhost</node>
-    <command>docker exec rfsim5g-oai-nr-ue sh -c "ip rule add from 12.1.2.2/32 table 1002 prio 1002; ip route replace default dev oaitun_ue1p2 src 12.1.2.2 table 1002"</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Ping ext-dn from UE PDU session 1 interface</desc>
-    <node>localhost</node>
-    <command>docker exec rfsim5g-oai-nr-ue ping -I oaitun_ue1 -c 10 192.168.72.135</command>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Command</class>
-    <desc>Ping ext-dn from UE PDU session 2 interface</desc>
-    <node>localhost</node>
-    <command>docker exec rfsim5g-oai-nr-ue ping -I oaitun_ue1p2 -c 10 192.168.72.135</command>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) QFI 1 (default) flow on PDU session 1 (port 5201)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.1.2 -p 5201</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) QFI 2 flow on PDU session 1 (port 52080)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.1.2 -p 52080</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) QFI 3 flow on PDU session 1 (port 52081)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.1.2 -p 52081</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/1Mbps/UDP)(6 sec) default flow on PDU session 2 (port 5201)</desc>
-    <iperf_args>-u -b 1M -t 6 -B 12.1.2.2 -p 5201</iperf_args>
+    <class>Ping</class>
+    <desc>Ping ext-dn from NR-UE on PDU session ID 2</desc>
     <id>rfsim5g_ue_pdu_2</id>
     <node>localhost</node>
     <svr_id>rfsim5g_ext_dn</svr_id>
     <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/1Mbps/UDP)(6 sec) QFI 1 (default) flow on PDU session 1 (port 5201)</desc>
-    <iperf_args>-u -b 1M -t 6 -R -B 12.1.1.2 -p 5201</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/1Mbps/UDP)(6 sec) QFI 2 flow on PDU session 1 (port 52080)</desc>
-    <iperf_args>-u -b 1M -t 6 -R -B 12.1.1.2 -p 52080</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/1Mbps/UDP)(6 sec) QFI 3 flow on PDU session 1 (port 52081)</desc>
-    <iperf_args>-u -b 1M -t 6 -R -B 12.1.1.2 -p 52081</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>10</iperf_bitrate_threshold>
+    <ping_args>-c 20 -i 0.25</ping_args>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
   </testCase>
 
   <testCase>

ci-scripts/xml_files/container_5g_zmq_2x2.xml

@@ -1,109 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>zmq-5gnr-tdd-2x2</htmlTabRef>
-  <htmlTabName>Monolithic SA TDD 2x2 gNB with zmq radio</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>localhost</node>
-    <images>oai-gnb-asan oai-nr-ue-asan</images>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OAI 5G CoreNetwork</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2/</yaml_path>
-    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OAI 5G gNB+UE RF sim SA</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2</yaml_path>
-    <services>oai-gnb oai-nr-ue</services>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping ext-dn from NR-UE</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping NR-UE from ext-dn</desc>
-    <id>rfsim5g_ext_dn</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ue</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 10M -t 20 -R</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 3M -t 20</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy all OAI 5G stack</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2</yaml_path>
-    <analysis>
-      <services>oai-gnb=RetxCheck=1,0,0,0 oai-gnb=EndsWithBye oai-nr-ue</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>localhost</node>
-    <images>oai-gnb-asan oai-nr-ue-asan</images>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_5g_zmq_ocudu_1x1.xml

@@ -1,109 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>ocudu-5gnr-tdd-1x1</htmlTabRef>
-  <htmlTabName>OCUDU gnb split8 with OAI UE</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>localhost</node>
-    <images>oai-gnb-asan oai-nr-ue-asan</images>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OAI 5G CoreNetwork</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu</yaml_path>
-    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OCUDU Split 8 gNB + OAI UE</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu</yaml_path>
-    <services>ocudu-gnb oai-nr-ue</services>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping ext-dn from NR-UE</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping NR-UE from ext-dn</desc>
-    <id>rfsim5g_ext_dn</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ue</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/3Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 3M -t 20 -R</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 3M -t 20</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy all OAI 5G stack</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu</yaml_path>
-    <analysis>
-      <services>oai-nr-ue</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>localhost</node>
-    <images>oai-gnb-asan oai-nr-ue-asan</images>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_5g_zmq_ocudu_2x2.xml

@@ -1,109 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>ocudu-5gnr-tdd-2x2</htmlTabRef>
-  <htmlTabName>OCUDU gnb split8 with OAI UE</htmlTabName>
-  <htmlTabIcon>wrench</htmlTabIcon>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>localhost</node>
-    <images>oai-gnb-asan oai-nr-ue-asan</images>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OAI 5G CoreNetwork</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu</yaml_path>
-    <services>mysql oai-amf oai-smf oai-upf oai-ext-dn</services>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy OCUDU Split 8 gNB + OAI UE</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu</yaml_path>
-    <services>ocudu-gnb oai-nr-ue</services>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach OAI UE (Wait for IP)</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping ext-dn from NR-UE</desc>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping NR-UE from ext-dn</desc>
-    <id>rfsim5g_ext_dn</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ue</svr_id>
-    <svr_node>localhost</svr_node>
-    <ping_args>-c 20 -i 0.25</ping_args>
-    <ping_packetloss_threshold>5</ping_packetloss_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (DL/10Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 1M -t 20 -R</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>Iperf (UL/3Mbps/UDP)(20 sec)</desc>
-    <iperf_args>-u -b 1M -t 20</iperf_args>
-    <id>rfsim5g_ue</id>
-    <node>localhost</node>
-    <svr_id>rfsim5g_ext_dn</svr_id>
-    <svr_node>localhost</svr_node>
-    <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>90</iperf_bitrate_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy all OAI 5G stack</desc>
-    <node>localhost</node>
-    <yaml_path>ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu</yaml_path>
-    <analysis>
-      <services>oai-nr-ue</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>localhost</node>
-    <images>oai-gnb-asan oai-nr-ue-asan</images>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_image_build.xml

@@ -7,7 +7,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>obelix</node>
   </testCase>
 

ci-scripts/xml_files/container_image_build_arm.xml

@@ -7,7 +7,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>gracehopper3-oai</node>
   </testCase>
 

ci-scripts/xml_files/container_image_build_jetson.xml

@@ -7,7 +7,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>jetson3-oai</node>
   </testCase>
 

ci-scripts/xml_files/container_l2sim_proxy.xml

@@ -0,0 +1,15 @@
+<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
+
+<testCaseList>
+  <htmlTabRef>l2sim-4glte-5gnr-proxy-build</htmlTabRef>
+  <htmlTabName>Build L2sim proxy image</htmlTabName>
+  <htmlTabIcon>wrench</htmlTabIcon>
+
+  <testCase>
+    <class>Build_Proxy</class>
+    <desc>Build L2sim Proxy Image</desc>
+    <node>localhost</node>
+    <proxy_commit>b64d9bce986b38ca59e8582864ade3fcdd05c0dc</proxy_commit>
+  </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml

@@ -34,7 +34,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_if4_5.xml

@@ -34,7 +34,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1_no_rrc_activity.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_cdrx.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml

@@ -35,7 +35,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 
@@ -54,7 +54,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 1</desc>
     <node>carabe</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_fdd_20Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>hutch</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1.xml

@@ -34,7 +34,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_05Mhz_tm1_if4_5.xml

@@ -28,7 +28,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_10Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_lte_b200_tdd_20Mhz_tm1_default_scheduler.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>starsky</node>
   </testCase>
 

ci-scripts/xml_files/container_sa_aerial_quectel.xml

@@ -31,7 +31,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>gracehopper1-oai</node>
   </testCase>
 
@@ -122,7 +122,7 @@
     <node>gracehopper1-oai</node>
     <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial</yaml_path>
     <analysis>
-      <services>oai-gnb-aerial=EndsWithBye</services>
+      <services>oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_aerial_quectel_ul_heavy.xml

@@ -31,7 +31,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>gracehopper1-oai</node>
   </testCase>
 
@@ -111,7 +111,7 @@
     <node>gracehopper1-oai</node>
     <yaml_path>ci-scripts/yaml_files/sa_gnb_aerial_ul</yaml_path>
     <analysis>
-      <services>oai-gnb-aerial=EndsWithBye</services>
+      <services>oai-gnb-aerial=RetxCheck=20,100,100,100 oai-gnb-aerial=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_b200_quectel.xml

@@ -27,7 +27,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>ofqot</node>
   </testCase>
 

ci-scripts/xml_files/container_sa_fhi72_benetel_2x2_100MHz_9b_mplane_amariue.xml

@@ -1,149 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>test-5g-fhi72-benetel-2x2-100MHz-9b-mplane</htmlTabRef>
-  <htmlTabName>100 MHz 2x2 9b TDD SA Benetel M-plane</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-
-  <testCase>
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Script</class>
-    <desc>Configure system for low-latency RT performance</desc>
-    <node>cacofonix</node>
-    <script>yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/setup_config.sh</script>
-  </testCase>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>Initialize_UE</class>
-    <desc>Initialize Amarisoft UE</desc>
-    <id>amarisoft_00105_100MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>cacofonix</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/100MHz/Benetel) in a container</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb</yaml_path>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping: 100 pings in 10 sec</desc>
-    <id>amarisoft_ue_1</id>
-    <svr_id>oc-cn5g-00105</svr_id>
-    <ping_args>-c 100 -i 0.1</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/250Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 250M -t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/35Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 35M -t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate UE</desc>
-    <id>amarisoft_00105_100MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>UndeployCoreNetwork</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate 5G Core</desc>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_benetel_4x4_40MHz_9b_mplane_amariue.xml

@@ -1,149 +0,0 @@
-<!-- SPDX-License-Identifier: LicenseRef-CSSL-1.0 -->
-
-<testCaseList>
-  <htmlTabRef>test-5g-fhi72-benetel-40Mhz-4x4-9b-mplane</htmlTabRef>
-  <htmlTabName>40MHz 4x4 9b TDD SA Benetel M-plane</htmlTabName>
-  <htmlTabIcon>tasks</htmlTabIcon>
-
-  <testCase>
-    <class>DeployCoreNetwork</class>
-    <desc>Initialize 5G Core</desc>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-  <testCase>
-    <class>Custom_Script</class>
-    <desc>Configure system for low-latency RT performance</desc>
-    <node>cacofonix</node>
-    <script>yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_config.sh</script>
-  </testCase>
-
-  <testCase>
-    <class>Pull_Local_Registry</class>
-    <desc>Pull Images from Local Registry</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>Initialize_UE</class>
-    <desc>Initialize Amarisoft UE</desc>
-    <id>amarisoft_00105_40MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
-    <node>cacofonix</node>
-  </testCase>
-
-  <testCase>
-    <class>Deploy_Object</class>
-    <desc>Deploy gNB (TDD/Band78/100MHz/Benetel) in a container</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb</yaml_path>
-  </testCase>
-
-  <testCase>
-    <class>Attach_UE</class>
-    <desc>Attach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Ping</class>
-    <desc>Ping: 100 pings in 10 sec</desc>
-    <id>amarisoft_ue_1</id>
-    <svr_id>oc-cn5g-00105</svr_id>
-    <ping_args>-c 100 -i 0.1</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
-    <ping_rttavg_threshold>15</ping_rttavg_threshold>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/130Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 130M -t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/15Mbps/UDP)(30 sec)</desc>
-    <iperf_args>-u -b 15M -t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_packetloss_threshold>20</iperf_packetloss_threshold>
-    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
-    <iperf_profile>balanced</iperf_profile>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (DL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30 -R</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>40</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Iperf</class>
-    <desc>iperf (UL/TCP)(30 sec)</desc>
-    <iperf_args>-t 30</iperf_args>
-    <id>amarisoft_ue_1</id>
-    <iperf_tcp_rate_target>10</iperf_tcp_rate_target>
-    <svr_id>oc-cn5g-00105</svr_id>
-  </testCase>
-
-  <testCase>
-    <class>Detach_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Detach UE</desc>
-    <id>amarisoft_ue_1</id>
-  </testCase>
-
-  <testCase>
-    <class>Terminate_UE</class>
-    <always_exec>true</always_exec>
-    <desc>Terminate UE</desc>
-    <id>amarisoft_00105_40MHz</id>
-  </testCase>
-
-  <testCase>
-    <class>IdleSleep</class>
-    <desc>Sleep</desc>
-    <idle_sleep_time_in_sec>5</idle_sleep_time_in_sec>
-  </testCase>
-
-  <testCase>
-    <class>Undeploy_Object</class>
-    <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
-    <node>cacofonix</node>
-    <yaml_path>ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb</yaml_path>
-    <analysis>
-      <services>oai-gnb=EndsWithBye</services>
-    </analysis>
-  </testCase>
-
-  <testCase>
-    <class>Clean_Test_Server_Images</class>
-    <always_exec>true</always_exec>
-    <desc>Clean Test Images on Test Server</desc>
-    <node>cacofonix</node>
-    <images>oai-gnb-fhi72</images>
-  </testCase>
-
-  <testCase>
-    <class>UndeployCoreNetwork</class>
-    <desc>Terminate 5G Core</desc>
-    <always_exec>true</always_exec>
-    <cn_id>oc-cn5g-00105</cn_id>
-  </testCase>
-
-</testCaseList>

ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml

@@ -12,13 +12,6 @@
     <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_config.sh</script>
   </testCase>
 
-  <testCase>
-    <class>Custom_Script</class>
-    <desc>Activate carriers on VVDN RU</desc>
-    <node>cacofonix</node>
-    <script>scripts/vvdn-activate-carriers.sh</script>
-  </testCase>
-
   <testCase>
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
@@ -28,7 +21,7 @@
 
   <testCase>
     <class>Create_Workspace</class>
-    <desc>Create new Workspace</desc>
+    <desc>Create new Workspace for server 0</desc>
     <node>cacofonix</node>
   </testCase>
 
@@ -141,9 +134,9 @@
   <testCase>
     <class>Custom_Script</class>
     <always_exec>true</always_exec>
-    <desc>Inactivate carriers on VVDN RU</desc>
+    <desc>Set CPU to idle state, set kernel parameters to default values</desc>
     <node>cacofonix</node>
-    <script>scripts/vvdn-inactivate-carriers.sh</script>
+    <script>yaml_files/sa_fhi_7.2_vvdn_gnb/setup_cleanup.sh</script>
   </testCase>
 
 </testCaseList>

ci-scripts/xml_files/container_sa_n310_2X2_100MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_100MHz</yaml_path>
     <analysis>
-      <services>oai-gnb=EndsWithBye</services>
+      <services>oai-gnb=RetxCheck=dl=10,100,100,100;ul=25,100,100,100 oai-gnb=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_n310_2X2_60MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_2x2_60MHz</yaml_path>
     <analysis>
-      <services>oai-gnb=EndsWithBye</services>
+      <services>oai-gnb=RetxCheck=dl=15,100,100,100;ul=20,100,100,100 oai-gnb=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

@@ -104,7 +104,7 @@
     <node>matix</node>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
     <analysis>
-      <services>oai-vnf=EndsWithBye oai-pnf=EndsWithBye</services>
+      <services>oai-vnf=RetxCheck=10,100,100,100 oai-vnf=EndsWithBye oai-pnf=EndsWithBye</services>
     </analysis>
   </testCase>
 

ci-scripts/yaml_files/5g_rfsimulator/mini_nonrf_config.yaml

@@ -43,12 +43,6 @@ nfs:
     n4:
       interface_name: eth0
       port: 8805
-  pcf:
-    host: oai-pcf
-    sbi:
-      port: 8080
-      api_version: v1
-      interface_name: eth0
 
   upf:
     host: oai-upf
@@ -83,10 +77,6 @@ database:
 snssais:
   - &embb_slice1
     sst: 1
-    sd: "FFFFFF"
-  - &embb_slice2
-    sst: 1
-    sd: "123456"
 
 ############## NF-specific configuration
 amf:
@@ -113,7 +103,6 @@ amf:
       tac: 0x0001
       nssai:
         - *embb_slice1
-        - *embb_slice2
   supported_integrity_algorithms:
     - "NIA0"
     - "NIA1"
@@ -127,7 +116,7 @@ smf:
   ue_mtu: 1500
   support_features:
     use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
-    use_local_pcc_rules: no # Enforce PCC rules from PCF
+    use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
   upfs:
     - host: oai-upf
       port: 8805
@@ -155,9 +144,6 @@ smf:
       - sNssai: *embb_slice1
         dnnSmfInfoList:
           - dnn: "oai"
-      - sNssai: *embb_slice2
-        dnnSmfInfoList:
-          - dnn: "openairinterface"
   local_subscription_infos:
     - single_nssai: *embb_slice1
       dnn: "oai"
@@ -165,19 +151,6 @@ smf:
         5qi: 9
         session_ambr_ul: "200Mbps"
         session_ambr_dl: "400Mbps"
-    - single_nssai: *embb_slice2
-      dnn: "openairinterface"
-      qos_profile:
-        5qi: 9
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
-
-pcf:
-  local_policy:
-    policy_decisions_path: /openair-pcf/policies/policy_decisions
-    pcc_rules_path: /openair-pcf/policies/pcc_rules
-    traffic_rules_path: /openair-pcf/policies/traffic_rules
-    qos_data_path: /openair-pcf/policies/qos_data
 
 upf:
   support_features:
@@ -189,15 +162,9 @@ upf:
       - sNssai: *embb_slice1
         dnnUpfInfoList:
           - dnn: "oai"
-      - sNssai: *embb_slice2
-        dnnUpfInfoList:
-          - dnn: "openairinterface"
 
 ## DNN configuration
 dnns:
   - dnn: "oai"
     pdu_session_type: "IPV4"
     ipv4_subnet: "12.1.1.0/24"
-  - dnn: "openairinterface"
-    pdu_session_type: "IPV4"
-    ipv4_subnet: "12.1.2.0/24"

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -45,26 +45,9 @@ services:
             - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
         depends_on:
             - oai-amf
-            - oai-pcf
         networks:
             public_net:
                 ipv4_address: 192.168.71.133
-    oai-pcf:
-        container_name: "rfsim5g-oai-pcf"
-        image: oaisoftwarealliance/oai-pcf:v2.2.1
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-pcf/etc/config.yaml
-            - ./policies/policy_decisions:/openair-pcf/policies/policy_decisions
-            - ./policies/pcc_rules:/openair-pcf/policies/pcc_rules
-            - ./policies/traffic_rules:/openair-pcf/policies/traffic_rules
-            - ./policies/qos_data:/openair-pcf/policies/qos_data
-        depends_on:
-            - oai-amf
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.142
     oai-upf:
         container_name: "rfsim5g-oai-upf"
         image: oaisoftwarealliance/oai-upf:v2.2.1
@@ -95,8 +78,7 @@ services:
         init: true
         entrypoint: /bin/bash -c \
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
-              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0;"\
-              "ip route add 12.1.2.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
         depends_on:
             - oai-upf
         networks:

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/policies/pcc_rules/pcc_rules.yaml

@@ -1,29 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-gbr-rule-default-3mbps:
-  flowInfos:
-    - flowDescription: permit out ip from any to assigned
-      packetFilterUsage: true
-  precedence: 10
-  refQosData:
-    - gbr-qos-default-3mbps
-
-gbr-rule-52080:
-  flowInfos:
-    - flowDescription: permit out ip from any to assigned 52080
-      packetFilterUsage: true
-    - flowDescription: permit in ip from assigned 52080 to any
-      packetFilterUsage: true
-  precedence: 7
-  refQosData:
-    - gbr-qos-52080-20mbps
-
-gbr-rule-52081:
-  flowInfos:
-    - flowDescription: permit out ip from any to assigned 52081
-      packetFilterUsage: true
-    - flowDescription: permit in ip from assigned 52081 to any
-      packetFilterUsage: true
-  precedence: 8
-  refQosData:
-    - gbr-qos-52081-10mbps

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/policies/policy_decisions/policy_decision.yaml

@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-decision_default:
-  default: true
-  pcc_rules:
-  - gbr-rule-default-3mbps
-
-decision_dnn_oai:
-  dnn: oai
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  - gbr-rule-52080
-  - gbr-rule-52081
-
-decision_dnn_openairinterface:
-  dnn: openairinterface
-  pcc_rules:
-  - gbr-rule-default-3mbps
-
-decision_supi2:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059450
-decision_supi3:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059451
-decision_supi4:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059452
-decision_supi5:
-  pcc_rules:
-  - gbr-rule-default-3mbps
-  supi_imsi: 001010000059453

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/policies/qos_data/qos_data.yaml

@@ -1,37 +0,0 @@
-# SPDX-License-Identifier: LicenseRef-CSSL-1.0
-
-gbr-qos-default-3mbps:
-  5qi: 9
-  maxbrUl: 1000 Mbps
-  maxbrDl: 1000 Mbps
-  gbrUl: 3 Mbps
-  gbrDl: 3 Mbps
-  arp:
-    priorityLevel: 8
-    preemptCap: NOT_PREEMPT
-    preemptVuln: NOT_PREEMPTABLE
-  priorityLevel: 50
-
-gbr-qos-52080-20mbps:
-  5qi: 67
-  maxbrUl: 1000 Mbps
-  maxbrDl: 1000 Mbps
-  gbrUl: 20 Mbps
-  gbrDl: 20 Mbps
-  arp:
-    priorityLevel: 8
-    preemptCap: NOT_PREEMPT
-    preemptVuln: NOT_PREEMPTABLE
-  priorityLevel: 30
-
-gbr-qos-52081-10mbps:
-  5qi: 69
-  maxbrUl: 1000 Mbps
-  maxbrDl: 1000 Mbps
-  gbrUl: 10 Mbps
-  gbrDl: 10 Mbps
-  arp:
-    priorityLevel: 8
-    preemptCap: NOT_PREEMPT
-    preemptVuln: NOT_PREEMPTABLE
-  priorityLevel: 40

ci-scripts/yaml_files/5g_vrtsim_chanmod/docker-compose.yaml

@@ -97,7 +97,7 @@ services:
         cap_drop:
             - ALL
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.chanmod 1 --vrtsim.num_ues 1
+            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.chanmod 1
         depends_on:
             - oai-ext-dn
         networks:
@@ -123,7 +123,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --ue-nb-ant-rx 2 --ue-nb-ant-tx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_vrtsim_cirdb/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
         cap_drop:
             - ALL
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.cirdb 1 --vrtsim.num_ues 1
+            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.cirdb 1 --vrtsim.cirdb_file /cirdb/cir_db.bin --vrtsim.cirdb_yaml /cirdb/cir_db.yaml --vrtsim.cirdb_model_id 0 --vrtsim.cirdb_ds_ns 1 --vrtsim.cirdb_speed_mps 1.5
         depends_on:
             cir-generator:
                 condition: service_completed_successfully
@@ -142,7 +142,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --ue-nb-ant-rx 2 --ue-nb-ant-tx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3619200000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_vrtsim_multiue/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
         cap_drop:
             - ALL
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.cirdb 1 --vrtsim.num_ues 2 --gNBs.[0].min_rxtxtime 8
+            USE_ADDITIONAL_OPTIONS: -E --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role server --vrtsim.num_ues 2 --vrtsim.cirdb 1 --vrtsim.cirdb_file /cirdb/cir_db.bin --vrtsim.cirdb_yaml /cirdb/cir_db.yaml --vrtsim.ue_config.[0].antennas 1x2 --vrtsim.ue_config.[0].model_id 0 --vrtsim.ue_config.[0].ds_ns 10.0 --vrtsim.ue_config.[0].speed_mps 1.5 --vrtsim.ue_config.[1].antennas 2x2 --vrtsim.ue_config.[1].model_id 1 --vrtsim.ue_config.[1].ds_ns 10.0 --vrtsim.ue_config.[1].speed_mps 1.5 --gNBs.[0].min_rxtxtime 8
         depends_on:
             cir-generator:
                 condition: service_completed_successfully
@@ -142,7 +142,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 0 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 0 --ue-nb-ant-tx 1 --ue-nb-ant-rx 2
         depends_on:
             - oai-gnb
         networks:
@@ -171,7 +171,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001101 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 1 --ue-nb-ant-tx 1 --ue-nb-ant-rx 2
+            USE_ADDITIONAL_OPTIONS: -E -r 106 --numerology 1 --band 78 -C 3319680000 --ssb 516 --uicc0.imsi 208990100001101 --log_config.global_log_options level,nocolor,time --device.name vrtsim --vrtsim.role client --vrtsim.ue_id 1 --ue-nb-ant-tx 2 --ue-nb-ant-rx 2
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu/docker-compose.yaml

@@ -1,162 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    mysql:
-        container_name: "rfsim5g-mysql"
-        image: mysql:9.6
-        init: true
-        volumes:
-            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
-        environment:
-            - TZ=Europe/Paris
-            - MYSQL_DATABASE=oai_db
-            - MYSQL_USER=test
-            - MYSQL_PASSWORD=test
-            - MYSQL_ROOT_PASSWORD=linux
-        healthcheck:
-            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 30
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.131
-    oai-amf:
-        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.2.1
-        environment:
-            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
-        depends_on:
-            - mysql
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.132
-    oai-smf:
-        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.2.1
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
-        depends_on:
-            - oai-amf
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.2.1
-        init: true
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
-        depends_on:
-            - oai-smf
-        cap_add:
-            - NET_ADMIN
-            - SYS_ADMIN
-        cap_drop:
-            - ALL
-        privileged: true
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.134
-                interface_name: eth0
-            traffic_net:
-                ipv4_address: 192.168.72.134
-                interface_name: eth1
-    oai-ext-dn:
-        privileged: true
-        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
-        init: true
-        entrypoint: /bin/bash -c \
-              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
-              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
-        depends_on:
-            - oai-upf
-        networks:
-            traffic_net:
-                ipv4_address: 192.168.72.135
-        healthcheck:
-            test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    ocudu-gnb:
-        image: ghcr.io/bpodrygajlo/ocudu/ocudu-avx2:7cecca5
-        container_name: ocudu-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-        depends_on:
-            - oai-ext-dn
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.140
-        volumes:
-            - ./ocudu.yml:/ocudu.yml
-        healthcheck:
-            test: /bin/bash -c "pgrep gnb_split_8"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        command: ./usr/local/bin/gnb_split_8 -c /ocudu.yml
-
-    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
-        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-            - SYS_NICE
-        environment:
-            USE_ADDITIONAL_OPTIONS: -r 51 --numerology 1 --band 78 -C 3489420000 --ssb 0 -E --uicc0.imsi 208990100001100 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556 --zmq.[0].rx_channels tcp://192.168.71.140:4558
-        depends_on:
-            - ocudu-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
-        volumes:
-            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports1.xml:/opt/oai-nr-ue/etc/uecap.xml
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    public_net:
-        driver: bridge
-        name: rfsim5g-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.71.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-public"
-    traffic_net:
-        driver: bridge
-        name: rfsim5g-oai-traffic-net
-        ipam:
-            config:
-                - subnet: 192.168.72.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-traffic"

ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu/ocudu.yml

@@ -1,52 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (C) 2021-2026 Software Radio Systems Limited
-# SPDX-License-Identifier: BSD-3-Clause-Open-MPI
-# Refer to https://gitlab.com/ocudu/ocudu/-/raw/dev/LICENSE?ref_type=heads
-
-cu_cp:
-  amf:
-    addrs: 192.168.71.132
-    port: 38412
-    bind_addrs: 192.168.71.140
-    supported_tracking_areas:
-      - tac: 1
-        plmn_list:
-          - plmn: "20899"
-            tai_slice_support_list:
-              - sst: 1
-
-ru_sdr:
-  device_driver: zmq
-  device_args: tx_port=tcp://0.0.0.0:4558,rx_port=tcp://192.168.71.150:4556
-  srate: 23.04
-  tx_gain: 25
-  rx_gain: 25
-
-cell_cfg:
-  dl_arfcn: 632628
-  band: 78
-  channel_bandwidth_MHz: 20
-  common_scs: 30
-  plmn: "20899"
-  tac: 1
-  pci: 1
-  tdd_ul_dl_cfg:
-    dl_ul_tx_period: 5
-    nof_dl_slots: 3
-    nof_dl_symbols: 10
-    nof_ul_slots: 1
-    nof_ul_symbols: 2
-  csi:
-    csi_rs_enabled: false
-  pucch:
-    formats: f0_and_f2
-    nof_cell_csi_res: 0
-
-log:
-  filename: gnb.log
-  all_level: debug
-
-pcap:
-  mac_enable: false
-  mac_filename: /tmp/gnb_mac.pcap
-  ngap_enable: false
-  ngap_filename: /tmp/gnb_ngap.pcap

ci-scripts/yaml_files/5g_zmq_radio_2x2/docker-compose.yaml

@@ -1,164 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    mysql:
-        container_name: "rfsim5g-mysql"
-        image: mysql:9.6
-        init: true
-        volumes:
-            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
-        environment:
-            - TZ=Europe/Paris
-            - MYSQL_DATABASE=oai_db
-            - MYSQL_USER=test
-            - MYSQL_PASSWORD=test
-            - MYSQL_ROOT_PASSWORD=linux
-        healthcheck:
-            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 30
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.131
-    oai-amf:
-        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.2.1
-        environment:
-            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
-        depends_on:
-            - mysql
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.132
-    oai-smf:
-        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.2.1
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
-        depends_on:
-            - oai-amf
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.2.1
-        init: true
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
-        depends_on:
-            - oai-smf
-        cap_add:
-            - NET_ADMIN
-            - SYS_ADMIN
-        cap_drop:
-            - ALL
-        privileged: true
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.134
-                interface_name: eth0
-            traffic_net:
-                ipv4_address: 192.168.72.134
-                interface_name: eth1
-    oai-ext-dn:
-        privileged: true
-        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
-        init: true
-        entrypoint: /bin/bash -c \
-              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
-              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
-        depends_on:
-            - oai-upf
-        networks:
-            traffic_net:
-                ipv4_address: 192.168.72.135
-        healthcheck:
-            test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
-        container_name: rfsim5g-oai-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-        environment:
-            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4558,tcp://0.0.0.0:4559 --zmq.[0].rx_channels tcp://oai-nr-ue:4556,tcp://oai-nr-ue:4557
-            ASAN_OPTIONS: detect_leaks=0
-        depends_on:
-            - oai-ext-dn
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.140
-        volumes:
-            - ../../conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf:/opt/oai-gnb/etc/gnb.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-softmodem"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
-        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-            - SYS_NICE
-        environment:
-            USE_ADDITIONAL_OPTIONS: -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556,tcp://0.0.0.0:4557 --zmq.[0].rx_channels tcp://oai-gnb:4558,tcp://oai-gnb:4559
-        depends_on:
-            - oai-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
-        volumes:
-            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    public_net:
-        driver: bridge
-        name: rfsim5g-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.71.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-public"
-    traffic_net:
-        driver: bridge
-        name: rfsim5g-oai-traffic-net
-        ipam:
-            config:
-                - subnet: 192.168.72.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-traffic"

ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu/docker-compose.yaml

@@ -1,162 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    mysql:
-        container_name: "rfsim5g-mysql"
-        image: mysql:9.6
-        init: true
-        volumes:
-            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
-        environment:
-            - TZ=Europe/Paris
-            - MYSQL_DATABASE=oai_db
-            - MYSQL_USER=test
-            - MYSQL_PASSWORD=test
-            - MYSQL_ROOT_PASSWORD=linux
-        healthcheck:
-            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 30
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.131
-    oai-amf:
-        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v2.2.1
-        environment:
-            - TZ=Europe/paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
-        depends_on:
-            - mysql
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.132
-    oai-smf:
-        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v2.2.1
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
-        depends_on:
-            - oai-amf
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.133
-    oai-upf:
-        container_name: "rfsim5g-oai-upf"
-        image: oaisoftwarealliance/oai-upf:v2.2.1
-        init: true
-        environment:
-            - TZ=Europe/Paris
-        volumes:
-            - ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
-        depends_on:
-            - oai-smf
-        cap_add:
-            - NET_ADMIN
-            - SYS_ADMIN
-        cap_drop:
-            - ALL
-        privileged: true
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.134
-                interface_name: eth0
-            traffic_net:
-                ipv4_address: 192.168.72.134
-                interface_name: eth1
-    oai-ext-dn:
-        privileged: true
-        container_name: rfsim5g-oai-ext-dn
-        image: oaisoftwarealliance/trf-gen-cn5g:latest
-        init: true
-        entrypoint: /bin/bash -c \
-              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
-              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
-        depends_on:
-            - oai-upf
-        networks:
-            traffic_net:
-                ipv4_address: 192.168.72.135
-        healthcheck:
-            test: /bin/bash -c "ping -c 2 192.168.72.134"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    ocudu-gnb:
-        image: ghcr.io/bpodrygajlo/ocudu/ocudu-avx2:7cecca5
-        container_name: ocudu-gnb
-        cap_drop:
-            - ALL
-        cap_add:
-            - SYS_NICE
-        depends_on:
-            - oai-ext-dn
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.140
-        volumes:
-            - ./ocudu.yml:/ocudu.yml
-        healthcheck:
-            test: /bin/bash -c "pgrep gnb_split_8"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-        command: ./usr/local/bin/gnb_split_8 -c /ocudu.yml
-
-    oai-nr-ue:
-        image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
-        container_name: rfsim5g-oai-nr-ue
-        cap_drop:
-            - ALL
-        cap_add:
-            - NET_ADMIN  # for interface bringup
-            - NET_RAW    # for ping
-            - SYS_NICE
-        environment:
-            USE_ADDITIONAL_OPTIONS: -r 106 --numerology 1 --band 78 -C 3489420000 --ssb 42 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --log_config.global_log_options level,nocolor,time --device.name oai_zmqdevif --zmq.[0].tx_channels tcp://0.0.0.0:4556,tcp://0.0.0.0:4557 --zmq.[0].rx_channels tcp://192.168.71.140:4558,tcp://192.168.71.140:4559
-        depends_on:
-            - ocudu-gnb
-        networks:
-            public_net:
-                ipv4_address: 192.168.71.150
-        devices:
-             - /dev/net/tun:/dev/net/tun
-        volumes:
-            - ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/uecap_ports2.xml:/opt/oai-nr-ue/etc/uecap.xml
-            - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf
-        healthcheck:
-            test: /bin/bash -c "pgrep nr-uesoftmodem"
-            start_period: 10s
-            start_interval: 500ms
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-networks:
-    public_net:
-        driver: bridge
-        name: rfsim5g-oai-public-net
-        ipam:
-            config:
-                - subnet: 192.168.71.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-public"
-    traffic_net:
-        driver: bridge
-        name: rfsim5g-oai-traffic-net
-        ipam:
-            config:
-                - subnet: 192.168.72.128/26
-        driver_opts:
-            com.docker.network.bridge.name: "rfsim5g-traffic"

ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu/ocudu.yml

@@ -1,54 +0,0 @@
-# SPDX-FileCopyrightText: Copyright (C) 2021-2026 Software Radio Systems Limited
-# SPDX-License-Identifier: BSD-3-Clause-Open-MPI
-# Refer to https://gitlab.com/ocudu/ocudu/-/raw/dev/LICENSE?ref_type=heads
-
-cu_cp:
-  amf:
-    addrs: 192.168.71.132
-    port: 38412
-    bind_addrs: 192.168.71.140
-    supported_tracking_areas:
-      - tac: 1
-        plmn_list:
-          - plmn: "20899"
-            tai_slice_support_list:
-              - sst: 1
-
-ru_sdr:
-  device_driver: zmq
-  device_args: tx_port=tcp://0.0.0.0:4558,tx_port=tcp://0.0.0.0:4559,rx_port=tcp://192.168.71.150:4556,rx_port=tcp://192.168.71.150:4557
-  srate: 61.44
-  tx_gain: 25
-  rx_gain: 25
-
-cell_cfg:
-  dl_arfcn: 632628
-  band: 78
-  channel_bandwidth_MHz: 40
-  common_scs: 30
-  plmn: "20899"
-  tac: 1
-  pci: 1
-  nof_antennas_ul: 2
-  nof_antennas_dl: 2
-  tdd_ul_dl_cfg:
-    dl_ul_tx_period: 5
-    nof_dl_slots: 3
-    nof_dl_symbols: 10
-    nof_ul_slots: 1
-    nof_ul_symbols: 2
-  csi:
-    csi_rs_enabled: false
-  pucch:
-    formats: f0_and_f2
-    nof_cell_csi_res: 0
-
-log:
-  filename: gnb.log
-  all_level: debug
-
-pcap:
-  mac_enable: false
-  mac_filename: /tmp/gnb_mac.pcap
-  ngap_enable: false
-  ngap_filename: /tmp/gnb_ngap.pcap

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/docker-compose.yml

@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    dpdk-init:
-        image: docker.io/library/oai-dpdk-init:latest
-        network_mode: host
-        container_name: dpdk-init
-        entrypoint: "/tmp/setup_sriov.sh"
-        privileged: true
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ./setup_sriov_benetel.sh:/tmp/setup_sriov.sh
-            - /lib/modules:/lib/modules
-            - /usr/lib/modules:/usr/lib/modules
-    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}oai-gnb-fhi72:${TAG:-develop}
-        privileged: true
-        network_mode: "host"
-        container_name: oai-gnb
-        environment:
-            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12 --device.name oran_fhlib_5g_mplane --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ../../conf_files/gnb.sa.band78.273prb.fhi72.2x2-benetel550-9b-mplane.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev/hugepages:/dev/hugepages
-            - /home/oaicicd/.ssh/id_rsa.pub:/opt/oai-gnb/etc/id_rsa.pub
-            - /home/oaicicd/.ssh/id_rsa:/opt/oai-gnb/etc/id_rsa
-        # Please change these values based on your system
-        cpuset: "0-12"
-        depends_on:
-           dpdk-init:
-             condition: service_completed_successfully
-        healthcheck:
-           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-           start_period: 60s
-           start_interval: 500ms
-           interval: 5s
-           timeout: 5s
-           retries: 10

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/setup_config.sh

@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-set -e
-sudo cpupower idle-set -D 0 > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=-1
-sudo sysctl kernel.timer_migration=0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_2x2_100MHz_9b_mplane_gnb/setup_sriov_benetel.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: MIT
-
-set -eu
-
-pci_addr()
-{
-        PF_IF=$1
-        VF_INDEX=$2
-        SYSFS_PATH="/sys/class/net/${PF_IF}/device/virtfn${VF_INDEX}"
-
-        if [ ! -e "$SYSFS_PATH" ]; then
-                    echo "VF $VF_INDEX not found for interface $PF_IF"
-                        exit 1
-        fi
-        PCI_ADDR=$(basename "$(readlink "$SYSFS_PATH")")
-        echo "$PCI_ADDR"
-}
-IF_NAME=ens7f1
-## O-DU C Plane MAC ADDR and VLAN
-C_U_PLANE_MAC_ADD=00:11:22:33:44:66
-C_U_PLANE_VLAN=3
-MTU=9000
-DPDK_DEVBIND_PREFIX=/usr/local/bin
-NUM_VFs=1
-ethtool -G $IF_NAME rx 8160 tx 8160
-sh -c "echo 0 > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-sh -c "echo $NUM_VFs > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-C_U_PLANE_PCI=$(pci_addr $IF_NAME 0)
-# this next 2 lines is for C/U planes
-ip link set $IF_NAME vf 0 mac $C_U_PLANE_MAC_ADD vlan $C_U_PLANE_VLAN spoofchk off mtu $MTU
-sleep 1
-modprobe iavf
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --unbind $C_U_PLANE_PCI
-modprobe vfio-pci
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --bind vfio-pci $C_U_PLANE_PCI
-echo "Successfully configured C-PLANE and U-PLANE:
-  - C-PLANE MAC: $C_U_PLANE_MAC_ADD, VLAN: $C_U_PLANE_VLAN, PCI: $C_U_PLANE_PCI"
-exit 0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/docker-compose.yml

@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-services:
-    dpdk-init:
-        image: docker.io/library/oai-dpdk-init:latest
-        network_mode: host
-        container_name: dpdk-init
-        entrypoint: "/tmp/setup_sriov.sh"
-        privileged: true
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ./setup_sriov_benetel.sh:/tmp/setup_sriov.sh
-            - /lib/modules:/lib/modules
-            - /usr/lib/modules:/usr/lib/modules
-    oai-gnb:
-        image: ${REGISTRY-oaisoftwarealliance/}oai-gnb-fhi72:${TAG:-develop}
-        privileged: true
-        network_mode: "host"
-        container_name: oai-gnb
-        environment:
-            TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12 --device.name oran_fhlib_5g_mplane --log_config.global_log_options level,nocolor,time,line_num,function
-        devices:
-            - /dev/vfio:/dev/vfio/
-        volumes:
-            - ../../conf_files/gnb.sa.band78.106prb.fhi72.4x4-benetel550-9b-mplane.conf:/opt/oai-gnb/etc/gnb.conf
-            - /dev/hugepages:/dev/hugepages
-            - /home/oaicicd/.ssh/id_rsa.pub:/opt/oai-gnb/etc/id_rsa.pub
-            - /home/oaicicd/.ssh/id_rsa:/opt/oai-gnb/etc/id_rsa
-        # Please change these values based on your system
-        cpuset: "0-12"
-        depends_on:
-           dpdk-init:
-             condition: service_completed_successfully
-        healthcheck:
-           test: /bin/bash -c "/opt/oai-gnb/bin/check-prach-io.sh"
-           start_period: 60s
-           start_interval: 500ms
-           interval: 5s
-           timeout: 5s
-           retries: 10

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_cleanup.sh

@@ -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

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_config.sh

@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-set -e
-sudo cpupower idle-set -D 0 > /dev/null
-sudo sysctl kernel.sched_rt_runtime_us=-1
-sudo sysctl kernel.timer_migration=0

ci-scripts/yaml_files/sa_fhi_7.2_benetel550_4x4_40MHz_9b_mplane_gnb/setup_sriov_benetel.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: MIT
-
-set -eu
-
-pci_addr()
-{
-        PF_IF=$1
-        VF_INDEX=$2
-        SYSFS_PATH="/sys/class/net/${PF_IF}/device/virtfn${VF_INDEX}"
-
-        if [ ! -e "$SYSFS_PATH" ]; then
-                    echo "VF $VF_INDEX not found for interface $PF_IF"
-                        exit 1
-        fi
-        PCI_ADDR=$(basename "$(readlink "$SYSFS_PATH")")
-        echo "$PCI_ADDR"
-}
-IF_NAME=ens7f1
-## O-DU C Plane MAC ADDR and VLAN
-C_U_PLANE_MAC_ADD=00:11:22:33:44:66
-C_U_PLANE_VLAN=3
-MTU=9000
-DPDK_DEVBIND_PREFIX=/usr/local/bin
-NUM_VFs=1
-ethtool -G $IF_NAME rx 8160 tx 8160
-sh -c "echo 0 > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-sh -c "echo $NUM_VFs > /sys/class/net/$IF_NAME/device/sriov_numvfs"
-C_U_PLANE_PCI=$(pci_addr $IF_NAME 0)
-# this next 2 lines is for C/U planes
-ip link set $IF_NAME vf 0 mac $C_U_PLANE_MAC_ADD vlan $C_U_PLANE_VLAN spoofchk off mtu $MTU
-sleep 1
-modprobe iavf
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --unbind $C_U_PLANE_PCI
-modprobe vfio-pci
-${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --bind vfio-pci $C_U_PLANE_PCI
-echo "Successfully configured C-PLANE and U-PLANE:
-  - C-PLANE MAC: $C_U_PLANE_MAC_ADD, VLAN: $C_U_PLANE_VLAN, PCI: $C_U_PLANE_PCI"
-exit 0

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-deltaMCS.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.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

cmake_targets/build_oai

@@ -18,7 +18,7 @@ HWs=""
 BUILD_DIR=ran_build
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_aal websrv oai_iqplayer imscope imscope_record"
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_aal ldpc_xdma websrv oai_iqplayer imscope imscope_record"
 TARGET_LIST=""
 BUILD_TOOL_OPT="-j$(nproc)"
 
@@ -68,7 +68,7 @@ Options:
 --UE-conf-nvram [configuration file]
    Specify conf_nvram_path (default \"$conf_nvram_path\")
 -w | --hardware
-   USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, ZMQ, None (Default)
+   USRP, BLADERF, LMSSDR, IRIS, SIMU, AW2SORI, AERIAL, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 -t | --transport
    Selects the transport protocol type, options: None, Ethernet, oran_fhlib_5g, oran_fhlib_5g_mplane, WLS
@@ -223,7 +223,7 @@ function main() {
             shift 2;;
        -w | --hardware)
             case "$2" in
-                "USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "ZMQ")
+                "USRP" | "BLADERF" | "LMSSDR" | "IRIS")
                     HWs+=" OAI_"$2
                     TARGET_LIST="$TARGET_LIST oai_${2,,}devif" # ,, makes lowercase
                     CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"