From 683e982137d8156c7ece60653a295d936bcaef49 Mon Sep 17 00:00:00 2001
From: Jaroslava Fiedlerova <Jaroslava.Fiedlerova@openairinterface.org>
Date: Thu, 3 Apr 2025 19:02:44 +0200
Subject: [PATCH] CI: more modifications for FHI72 VVDN test

- use Ubuntu image, instead of RHEL image - gNB fails with "Illegal
  instruction" during RA, when running with RHEL image
- init DPDK in VA mode
- increase number of cores Tpool
---
 .../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf    | 1 +
 ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml       | 7 +++----
 .../yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml      | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
index 1ae1655fec..d81dd38694 100644
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -250,6 +250,7 @@ log_config :
 
 fhi_72 = {
   dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1");
+  dpdk_iova_mode = "VA";
   system_core = 0;
   io_core = 1;
   worker_cores = (2);
diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
index 927fe1a3e7..df48634240 100644
--- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
+++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml
@@ -53,11 +53,10 @@
   </testCase>
 
   <testCase id="110000">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <oc_project>oaicicd-ran</oc_project>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <svr_id>0</svr_id>
     <images>oai-gnb-fhi72</images>
-    <node>cacofonix</node>
   </testCase>
   <testCase id="800813">
     <class>Create_Workspace</class>
diff --git a/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml
index 7ea8b576d4..a74b583e2b 100644
--- a/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml
@@ -2,7 +2,6 @@ services:
     oai-gnb:
         image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-fhi72:${TAG:-develop}
         cap_add:
-            - SYS_ADMIN
             - IPC_LOCK
             - SYS_NICE
         cap_drop:
@@ -10,14 +9,14 @@ services:
         container_name: oai-gnb
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --thread-pool 6,7,8,9
+            USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12
         devices:
             - /dev/vfio:/dev/vfio/
         volumes:
             - ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev/hugepages:/dev/hugepages
         # Please change these values based on your system
-        cpuset: "0,1,2,3,4,5,6,7,8,9"
+        cpuset: "0,1,2,3,4,5,6,7,8,9,10,11,12"
         networks:
             oai-net:
                 ipv4_address: 172.21.18.20