Merge remote-tracking branch 'origin/ci-fixes' into integration_2024_w13

ci-scripts/Jenkinsfile-GitLab-Container

@@ -308,29 +308,6 @@ pipeline {
             }
           }
         }
-        stage ("L2-Sim-Test-5G") {
-          when { expression {do5Gtest} }
-          steps {
-            script {
-              triggerSlaveJob ('RAN-L2-Sim-Test-5G', 'L2-Sim-Test-5G')
-            }
-          }
-          post {
-            always {
-              script {
-                // Using a unique variable name for each test stage to avoid overwriting on a global variable
-                // due to parallel-time concurrency
-                l2Sim5GStatus = finalizeSlaveJob('RAN-L2-Sim-Test-5G')
-              }
-            }
-            failure {
-              script {
-                currentBuild.result = 'FAILURE'
-                failingStages += l2Sim5GStatus
-              }
-            }
-          }
-        }
         stage ("LTE-B200-FDD-LTEBOX-Container") {
           when { expression {do4Gtest} }
           steps {

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

@@ -186,7 +186,7 @@ L1s = (
   num_cc = 1;
   tr_n_preference = "local_mac";
   prach_dtx_threshold = 200;
-  pucch0_dtx_threshold = 150;
+  pucch0_dtx_threshold = 100;
   ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
 );

ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml

@@ -54,7 +54,7 @@ services:
                                     --continuous-tx -E
                                     --telnetsrv --telnetsrv.shrmod ci
                                     --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1
-                                    --RUs.[0].att_rx 18 --RUs.[0].att_tx 18
+                                    --RUs.[0].att_rx 14 --RUs.[0].att_tx 14
                                     --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf

docker/Dockerfile.build.rhel9

@@ -35,4 +35,8 @@ COPY . .
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --noavx512 -c
+    CXXFLAGS="-Werror -fstack-protector-strong" CFLAGS="-Werror -fstack-protector-strong" ./build_oai -c --ninja \
+      --eNB --gNB --RU --UE --nrUE \
+      --build-lib "telnetsrv enbscope uescope nrscope" \
+      -w USRP -t Ethernet \
+      --noavx512

docker/Dockerfile.build.ubuntu20

@@ -42,6 +42,6 @@ RUN /bin/sh oaienv && \
       -w USRP -t Ethernet \
       --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF \
       --noavx512 \
-      --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror $BUILD_OPTION && \
+      --cmake-opt -DCMAKE_C_FLAGS="-Werror -fstack-protector-strong" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror -fstack-protector-strong" $BUILD_OPTION && \
     # Mainly to see if the sanitize option was perfectly executed
     ldd ran_build/build/nr-softmodem

docker/Dockerfile.gNB.aw2s.rhel9

@@ -47,6 +47,7 @@ RUN dnf update -y && \
         libXpm \
         libX11 \
         atlas \
+        gdb \
         lksctp-tools \
         tzdata \
         net-tools \

docker/Dockerfile.gNB.aw2s.rocky

@@ -48,6 +48,7 @@ RUN dnf update -y && \
         libXpm \
         libX11 \
         atlas \
+        gdb \
         lksctp-tools \
         tzdata \
         net-tools \

docker/Dockerfile.gNB.aw2s.ubuntu20

@@ -51,6 +51,7 @@ RUN apt-get update && \
         libblas3 \
         libatlas3-base \
         libconfig9 \
+        gdb \
         openssl \
         net-tools \
         iproute2 \

docker/debug_core_image.sh

@@ -10,9 +10,10 @@ die() {
   exit 1
 }
 
+# for mounting into docker, need absolute path -> realpath
 IMAGE=$1
-COREDUMP=$2
-SOURCES=$3
+COREDUMP=$(realpath $2)
+SOURCES=$(realpath $3)
 
 set -x
 
@@ -32,6 +33,9 @@ docker image inspect $IMAGE > /dev/null || exit 1
 if [ $(grep "oai-gnb:" <<< $IMAGE) ] || [ $(grep "oai-gnb-aerial:" <<< $IMAGE) ]; then
   EXEC=bin/nr-softmodem
   TYPEPATH=oai-gnb
+elif [ $(grep "oai-gnb-aw2s:" <<< $IMAGE) ]; then
+  EXEC=bin/nr-softmodem
+  TYPEPATH=oai-gnb-aw2s
 elif [ $(grep "oai-nr-ue:" <<< $IMAGE) ]; then
   EXEC=bin/nr-uesoftmodem
   TYPEPATH=oai-nr-ue