Commit 05f9c975 authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova
Browse files

Merge branch 'integration_2025_w32' into 'develop' 

Integration: `2025.w32`

* !3548 NR UE: fix reliable SIB19 reception when ntn-UlSyncValidityDuration-r17 expires
* !3559 numelt in place of config_isparamset
* !3487 T hacks: add new tracer ant0 and a tool to plot ofdm data from usrp or rfsim (output or input)
* !3541 simplify and make more local variables in nr_rx_pdcch() and fix small bugs
* !3547 Add a CU-UP load tester and improve GTP performance
* !3552 CI: refactor iperf3 UDP analysis function
* !3557 Fix PDSCH rate-matching for periodic CSI in UE
* !3571 fix time manager tests in the CI
* !3344 LDPC BBDEV/AAL rework
* !3560 CI: Refactor log collection, collect also (COTS) UE logs

See merge request !3565
parents b7636927 3491a044

CMakeLists.txt

+9 −5
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ if(NOT DEFINED ENV{CPM_SOURCE_CACHE}) 
endif()

include("cmake_targets/CPM.cmake")



set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")



##############################

### CCache: reduce compilation time

##############################
@@ -1407,12 +1409,14 @@ add_library(MME_APP ${MME_APP_SRC}) 
target_link_libraries(MME_APP PRIVATE m2ap m3ap)

target_link_libraries(MME_APP PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



find_package(sctp REQUIRED)

set(SCTP_SRC

  ${OPENAIR3_DIR}/SCTP/sctp_common.c

  ${OPENAIR3_DIR}/SCTP/sctp_eNB_task.c

  ${OPENAIR3_DIR}/SCTP/sctp_eNB_itti_messaging.c

)

add_library(SCTP_CLIENT ${SCTP_SRC})

target_link_libraries(SCTP_CLIENT PRIVATE sctp::sctp)

target_link_libraries(SCTP_CLIENT PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)



set(NAS_SRC ${OPENAIR3_DIR}/NAS/)
@@ -1711,7 +1715,6 @@ include_directories("${NFAPI_DIR}/pnf_sim/inc") 
add_library(oai_iqplayer MODULE

	${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c

	)

set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")



#################################

# add executables for operation
@@ -1758,7 +1761,7 @@ target_link_libraries(lte-softmodem PRIVATE 
  ${NAS_UE_LIB} ITTI SIMU shlib_loader

  -Wl,--end-group z dl)



target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)

target_link_libraries(lte-softmodem PRIVATE pthread m CONFIG_LIB rt)

target_link_libraries(lte-softmodem PRIVATE ${T_LIB})

target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

target_link_libraries(lte-softmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
@@ -1814,7 +1817,7 @@ target_link_libraries(lte-uesoftmodem PRIVATE 
  ${NAS_UE_LIB} ITTI shlib_loader

  -Wl,--end-group z dl)



target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt sctp)

target_link_libraries(lte-uesoftmodem PRIVATE pthread m CONFIG_LIB rt)

target_link_libraries(lte-uesoftmodem PRIVATE ${T_LIB})

target_link_libraries(lte-uesoftmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

target_link_libraries(lte-uesoftmodem PRIVATE ${blas_LIBRARIES} ${cblas_LIBRARIES} ${lapacke_LIBRARIES} ${lapack_LIBRARIES})
@@ -1851,7 +1854,7 @@ target_link_libraries(nr-softmodem PRIVATE 
  time_management

  -Wl,--end-group z dl)



target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt sctp)

target_link_libraries(nr-softmodem PRIVATE pthread m CONFIG_LIB rt)

target_link_libraries(nr-softmodem PRIVATE ${T_LIB})

target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)

target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
@@ -1888,7 +1891,7 @@ target_link_libraries(nr-cuup PRIVATE 
                      CONFIG_LIB ITTI SCTP_CLIENT

                      GTPV1U e1ap f1ap

                      time_management

                      z sctp dl pthread shlib_loader ${T_LIB})

                      z dl pthread shlib_loader ${T_LIB})

target_link_libraries(nr-cuup PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)

if(E2_AGENT)

  target_link_libraries(nr-cuup PRIVATE e2_agent e2_agent_arg e2_ran_func_cuup)
@@ -2182,3 +2185,4 @@ add_subdirectory(openair1) 
add_subdirectory(openair2)

add_subdirectory(openair3)

add_subdirectory(radio)

add_subdirectory(tests)

ci-scripts/Jenkinsfile-tmp-full-ran

+0 −18
Original line number Diff line number Diff line
@@ -216,24 +216,6 @@ pipeline { 
        }

        stage('Log Collection') {

            parallel {

                stage('Log Collection (eNB - Build)') {

                    steps {

                        withCredentials([

                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']

                        ]) {

                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'

                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"



                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'

                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"

                        }

                        script {

                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {

                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"

                            }

                        }

                    }

                }

                stage('Log Collection (eNB - Run)') {

                    steps {

                        withCredentials([

ci-scripts/Jenkinsfile-tmp-multi-enb

+0 −18
Original line number Diff line number Diff line
@@ -222,24 +222,6 @@ pipeline { 
        }

        stage('Log Collection') {

            parallel {

                stage('Log Collection (eNB - Build)') {

                    steps {

                        withCredentials([

                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']

                        ]) {

                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'

                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"



                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'

                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"

                        }

                        script {

                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {

                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"

                            }

                        }

                    }

                }

                stage('Log Collection (eNB - Run)') {

                    steps {

                        withCredentials([

ci-scripts/Jenkinsfile-tmp-multi-enb-nsa

+0 −18
Original line number Diff line number Diff line
@@ -210,24 +210,6 @@ pipeline { 
    }

    stage('Log Collection') {

      parallel {

        stage('Log Collection (eNB - Build)') {

          steps {

            withCredentials([

               [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']

            ]) {

              echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'

              sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"



              echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'

              sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"

            }

            script {

              if(fileExists("build.log.${env.BUILD_ID}.zip")) {

                archiveArtifacts "build.log.${env.BUILD_ID}.zip"

              }

            }

          }

        }

        stage('Log Collection (eNB - Run)') {

          steps {

            withCredentials([

ci-scripts/Jenkinsfile-tmp-ran

+0 −18
Original line number Diff line number Diff line
@@ -227,24 +227,6 @@ pipeline { 
        }

        stage('Log Collection') {

            parallel {

                stage('Log Collection (eNB - Build)') {

                    steps {

                        withCredentials([

                             [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.eNB_Credentials}", usernameVariable: 'eNB_Username', passwordVariable: 'eNB_Password']

                        ]) {

                            echo '\u2705 \u001B[32mLog Collection (eNB - Build)\u001B[0m'

                            sh "python3 ci-scripts/main.py --mode=LogCollectBuild --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --eNBSourceCodePath=${params.eNB_SourceCodePath}"



                            echo '\u2705 \u001B[32mLog Transfer (eNB - Build)\u001B[0m'

                            sh "sshpass -p \'${eNB_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${eNB_Username}@${params.eNB_IPAddress}:${eNB_SourceCodePath}/cmake_targets/build.log.zip ./build.log.${env.BUILD_ID}.zip || true"

                        }

                        script {

                            if(fileExists("build.log.${env.BUILD_ID}.zip")) {

                                archiveArtifacts "build.log.${env.BUILD_ID}.zip"

                            }

                        }

                    }

                }

                stage('Log Collection (eNB - Run)') {

                    steps {

                        withCredentials([