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