From 4b6c18b1dd8f8d63866c1a3b9c18929b9a04a593 Mon Sep 17 00:00:00 2001
From: Shubhika Garg <shubhika.garg@openairinterface.org>
Date: Mon, 29 Sep 2025 10:51:32 +0200
Subject: [PATCH 1/4] [ci] Fix MissingPropertyException - COTS-UE by binding
 `OAI_Registry` globally

`def` creates a variable local to the script object, not automatically visible inside helper functions.

This fixes the following exception in Jenkins:

    Found unhandled groovy.lang.MissingPropertyException exception:
    No such property: OAI_Registry for class: groovy.lang.Binding
---
 ci-scripts/Jenkinsfile-GitLab-Container | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/Jenkinsfile-GitLab-Container b/ci-scripts/Jenkinsfile-GitLab-Container
index c3f3037c78..44d857f1dc 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -35,7 +35,7 @@ def gitCommitAuthorEmailAddr
 // list of failing stages
 def failingStages = ""
 
-def OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
+OAI_Registry = "gracehopper3-oai.sboai.cs.eurecom.fr"
 
 pipeline {
   agent {

From 6193d7c7f452835bab2b0a268aaae2b10968bd69 Mon Sep 17 00:00:00 2001
From: Jaroslava Fiedlerova <Jaroslava.Fiedlerova@openairinterface.org>
Date: Mon, 29 Sep 2025 17:21:45 +0200
Subject: [PATCH 2/4] Create XML for OAIUE longrun pipeline

Test duration: 1 hour
Test scenario: 3x DL 10 min test (20 Mbps) + 3x UL 10 min test (5 Mbps)
---
 .../container_sa_n310_nrue_longrun.xml        | 179 ++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml

diff --git a/ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml b/ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml
new file mode 100644
index 0000000000..f0d8f4f3b6
--- /dev/null
+++ b/ci-scripts/xml_files/container_sa_n310_nrue_longrun.xml
@@ -0,0 +1,179 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+  <htmlTabRef>LONGRUN-5G-NRUE</htmlTabRef>
+  <htmlTabName>Longrun 40 MHz TDD SA</htmlTabName>
+  <htmlTabIcon>tasks</htmlTabIcon>
+  <TestCaseRequestedList>
+    060000
+    010000 010001
+    800813
+    020000
+    800814
+    020001
+    000001
+    001000
+    000100
+    001000
+    000100
+    001000
+    000100
+    001000
+    000200
+    001000
+    000200
+    001000
+    000200
+    040001 040000
+    333333
+    444444
+    060001
+  </TestCaseRequestedList>
+  <TestCaseExclusionList></TestCaseExclusionList>
+
+  <testCase id="060000">
+    <class>DeployCoreNetwork</class>
+    <desc>Initialize 5G Core</desc>
+    <cn_id>oc-cn5g</cn_id>
+  </testCase>
+
+  <testCase id="010000">
+    <class>Pull_Cluster_Image</class>
+    <desc>Pull Images from Cluster</desc>
+    <images>oai-gnb</images>
+    <node>avra</node>
+  </testCase>
+
+  <testCase id="010001">
+    <class>Pull_Cluster_Image</class>
+    <desc>Pull Images from Cluster</desc>
+    <images>oai-nr-ue</images>
+    <node>caracal</node>
+  </testCase>
+
+  <testCase id="800813">
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>avra</node>
+  </testCase>
+
+  <testCase id="020000">
+    <class>Deploy_Object</class>
+    <desc>Deploy gNB (TDD/Band78/40MHz/N310) in a container</desc>
+    <node>avra</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
+    <num_attempts>3</num_attempts>
+  </testCase>
+
+  <testCase id="800814">
+    <class>Create_Workspace</class>
+    <desc>Create new Workspace</desc>
+    <node>caracal</node>
+  </testCase>
+
+  <testCase id="020001">
+    <class>Deploy_Object</class>
+    <desc>Deploy nrUE (TDD/Band78/40MHz/N310) in a container</desc>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
+    <node>caracal</node>
+    <num_attempts>3</num_attempts>
+  </testCase>
+
+  <testCase id="000001">
+    <class>Attach_UE</class>
+    <desc>Attach OAIUE</desc>
+    <id>oai_ue_caracal</id>
+  </testCase>
+
+  <testCase id="000100">
+    <class>Iperf</class>
+    <desc>iperf (DL/10Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 10M -t 600 -i 1 -R</iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase id="000200">
+    <class>Iperf</class>
+    <desc>iperf (UL/2Mbps/UDP)(10 min)</desc>
+    <iperf_args>-u -b 2M -t 600 -i 1 </iperf_args>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
+    <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
+  </testCase>
+
+  <testCase id="001000">
+    <class>Ping</class>
+    <desc>Ping: 20pings in 20sec</desc>
+    <id>oai_ue_caracal</id>
+    <svr_id>oc-cn5g</svr_id>
+    <ping_args>-c 20</ping_args>
+    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_rttavg_threshold>25</ping_rttavg_threshold>
+  </testCase>
+
+  <testCase id="040000">
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy gNB</desc>
+    <node>avra</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_gnb</yaml_path>
+    <d_retx_th>20,100,100,100</d_retx_th>
+    <u_retx_th>20,100,100,100</u_retx_th>
+  </testCase>
+
+  <testCase id="040001">
+    <class>Undeploy_Object</class>
+    <always_exec>true</always_exec>
+    <desc>Undeploy nr UE</desc>
+    <node>caracal</node>
+    <yaml_path>ci-scripts/yaml_files/5g_sa_n310_nrue</yaml_path>
+  </testCase>
+
+  <testCase id="333333">
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>avra</node>
+    <images>oai-gnb</images>
+  </testCase>
+
+  <testCase id="444444">
+    <class>Clean_Test_Server_Images</class>
+    <always_exec>true</always_exec>
+    <desc>Clean Test Images on Test Server</desc>
+    <node>caracal</node>
+    <images>oai-nr-ue</images>
+  </testCase>
+
+  <testCase id="060001">
+    <class>UndeployCoreNetwork</class>
+    <desc>Terminate 5G Core</desc>
+    <always_exec>true</always_exec>
+    <cn_id>oc-cn5g</cn_id>
+  </testCase>
+
+</testCaseList>

From 7935c19d21f9ef848256204b81a78360b02a1da3 Mon Sep 17 00:00:00 2001
From: Jaroslava Fiedlerova <Jaroslava.Fiedlerova@openairinterface.org>
Date: Mon, 28 Jul 2025 22:31:11 +0200
Subject: [PATCH 3/4] Fix in CreateWorkspace

Previously, the script attempted to directly merge ${merge}, which could f
ail if the branch was not already available locally. This update explicitly
fetches the branch from origin and then merges FETCH_HEAD with --ff, ensuring
the merge works even when the branch is missing locally.
---
 ci-scripts/scripts/create_workspace.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/scripts/create_workspace.sh b/ci-scripts/scripts/create_workspace.sh
index c8410802db..a8359a9ae4 100755
--- a/ci-scripts/scripts/create_workspace.sh
+++ b/ci-scripts/scripts/create_workspace.sh
@@ -22,5 +22,5 @@ git config user.name "OAI Jenkins"
 git config advice.detachedHead false
 mkdir -p cmake_targets/log
 git checkout -f ${ref}
-[ -n "${merge}" ] && git merge --ff ${merge} -m "Temporary merge for CI"
+[ -n "${merge}" ] && git fetch origin ${merge} && git merge --ff FETCH_HEAD -m "Temporary merge for CI"
 exit 0

From 2dde472cfd78e4f7aca2e7b4a8d1e3ce59e55483 Mon Sep 17 00:00:00 2001
From: Jaroslava Fiedlerova <Jaroslava.Fiedlerova@openairinterface.org>
Date: Wed, 1 Oct 2025 10:58:39 +0200
Subject: [PATCH 4/4] Adjust gNB conf file in OAIUE test

Increase prach_dtx_threshold to avoid fake PRACH detection.
---
 ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
index 2f994ab25e..ed1c79911e 100644
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -184,7 +184,7 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference = "local_mac";
-  prach_dtx_threshold = 130;
+  prach_dtx_threshold = 150;
   #pucch0_dtx_threshold = 150;
 }
 );