Merge remote-tracking branch 'jfiedlerova/ci-update-aerial' into integration_2026_w29

CI: Update Aerial setup to 26-1 (#300)

This PR updates the cuBB image in the Aerial setup to release 26-1.
Reviewed-By: Rúben Soares Silva <rsilva@allbesmart.pt>

ci-scripts/cls_containerize.py

@@ -301,7 +301,7 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.01.07.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2026.03.04.tar.gz .')
 			if image == 'ran-build-fhi72-t2':
 				cmd.run('cp -f /opt/t2-patch/AMD-T2-SDFEC_25-03-1.patch .')
 			if name == 'oai-gnb-fhi72-t2':

ci-scripts/yaml_files/sa_gnb_aerial/aerial_l1_entrypoint.sh

-#!/bin/bash
-# SPDX-License-Identifier: MIT
-
-# Check if cuBB_SDK is defined, if not, use default path
-cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
-
-cd "$cuBB_Path" || exit 1
-
-# Restart MPS
-# Export variables
-export CUDA_DEVICE_MAX_CONNECTIONS=8
-export CUDA_MPS_PIPE_DIRECTORY=/var
-export CUDA_MPS_LOG_DIRECTORY=/var
-
-# Stop existing MPS
-echo quit | sudo -E nvidia-cuda-mps-control
-
-# Start MPS
-sudo -E nvidia-cuda-mps-control -d
-sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
-
-# Start cuphycontroller_scf
-# Check if an argument is provided
-if [ $# -eq 0 ]; then
-    # No argument provided, use default value
-    argument="P5G_WNC_GH"
-else
-    # Argument provided, use it
-    argument="$1"
-fi
-
-sudo -E "$cuBB_Path"/build.$(uname -m)/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build.$(uname -m)/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect

ci-scripts/yaml_files/sa_gnb_aerial/cuphycontroller_P5G_WNC_GH.yaml

-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-aerial_sdk_version: 25-3-cubb
+aerial_sdk_version: 26-1-cubb
 l2adapter_filename: l2_adapter_config_P5G_GH.yaml
 aerial_metrics_backend_address: 127.0.0.1:8081
 
@@ -50,7 +50,7 @@ cuphydriver_config:
   dpdk_file_prefix: cuphycontroller
   nics:
     - nic: '0000:01:00.0'
-      mtu: 9216
+      mtu: 8192
       cpu_mbufs: 196608
       uplane_tx_handles: 64
       txq_size: 8192
@@ -172,25 +172,6 @@ cuphydriver_config:
   enable_l1_param_sanity_check: 0
   pusch_nMaxLdpcHetConfigs: 32
   notify_ul_harq_buffer_release: 0
-
-  # data_config:
-    # datalake_core: 12           # This must be set for Data Lake and/or E3 Agent to be used
-    # datalake_db_write_enable: 1   # Enable/disable ClickHouse writes based on datalake_data_types
-    # datalake_samples: 1000000
-    # datalake_address: localhost
-    # datalake_engine: "MergeTree() PRIMARY KEY (TsTaiNs)"
-    # # datalake_drop_tables: 0   # Set to 1 to drop Clickhouse tables at startup
-    # datalake_data_types: [fh, pusch, hest]  # Data types to write to ClickHouse DB (all types always collected in memory for E3 Agent):
-                                            # fh = Fronthaul IQ samples,pusch = PUSCH/FAPI data, hest = channel estimates
-    # datalake_store_failed_pdu: 0      # Set to 1 to store PDU data even when CRC fails
-    # e3_agent_enable: 0          # Enable/disable E3 Agent and dApp capabilities
-    # num_rows_fh: 120
-    # num_rows_pusch: 200
-    # num_rows_hest: 140
-    # e3_pub_port: 5555           # E3 publisher port for indication messages
-    # e3_rep_port: 5556           # E3 reply port for E3AP requests
-    # e3_sub_port: 5560           # E3 subscriber port for Manager messages
-
   cells:
     - name: O-RU 0
       cell_id: 1
@@ -220,10 +201,13 @@ cuphydriver_config:
       exponent_ul: 4
       max_amp_ul: 65504
       mu: 1
-      T1a_max_up_ns: 280000
-      T1a_max_cp_ul_ns: 405000
-      Ta4_min_ns: 50000
-      Ta4_max_ns: 331000
+      T1a_max_cp_ul_ns: 392000
+      T1a_min_cp_ul_ns: 36000
+      T1a_max_cp_dl_ns: 464000
+      T1a_min_cp_dl_ns: 7600
+      T1a_max_up_ns: 339000
+      Ta4_min_ns: 84000
+      Ta4_max_ns: 280000
       Tcp_adv_dl_ns: 125000
       ul_u_plane_tx_offset_ns: 280000
       fh_len_range: 0

ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml

@@ -19,17 +19,16 @@ services:
     volumes:
       - /lib/modules:/lib/modules
       - /dev/hugepages:/dev/hugepages
-      - /usr/src:/usr/src
+      - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
+      - /run/systemd/system:/run/systemd/system
       - ./cuphycontroller_P5G_WNC_GH.yaml:/opt/nvidia/cuBB/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_WNC_GH.yaml
-      - ./aerial_l1_entrypoint.sh:/opt/nvidia/cuBB/aerial_l1_entrypoint.sh
       - /var/log/aerial:/var/log/aerial
-      - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-3
+    image: nv-cubb:26-1
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
-    command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
+    command: bash -c "/opt/nvidia/cuBB/run-l1.sh"
     healthcheck:
       test: ["CMD-SHELL",'grep -q "L1 is ready!" /tmp/phy.log && echo 0 || echo 1']
       interval: 20s
@@ -49,14 +48,6 @@ services:
     ipc: "container:nv-cubb"
     environment:
       USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,utc_time
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities:
-                - gpu
     network_mode: host
     shm_size: 4096m
     tty: true

ci-scripts/yaml_files/sa_gnb_aerial_30MHz/aerial_l1_entrypoint.sh

-#!/bin/bash
-# SPDX-License-Identifier: MIT
-
-# Check if cuBB_SDK is defined, if not, use default path
-cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
-
-cd "$cuBB_Path" || exit 1
-
-# Restart MPS
-# Export variables
-export CUDA_DEVICE_MAX_CONNECTIONS=8
-export CUDA_MPS_PIPE_DIRECTORY=/var
-export CUDA_MPS_LOG_DIRECTORY=/var
-
-# Stop existing MPS
-echo quit | sudo -E nvidia-cuda-mps-control
-
-# Start MPS
-sudo -E nvidia-cuda-mps-control -d
-sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
-
-# Start cuphycontroller_scf
-# Check if an argument is provided
-if [ $# -eq 0 ]; then
-    # No argument provided, use default value
-    argument="P5G_WNC_GH"
-else
-    # Argument provided, use it
-    argument="$1"
-fi
-
-sudo -E "$cuBB_Path"/build.$(uname -m)/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build.$(uname -m)/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect

ci-scripts/yaml_files/sa_gnb_aerial_30MHz/cuphycontroller_P5G_WNC_GH.yaml

-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-aerial_sdk_version: 25-3-cubb
+aerial_sdk_version: 26-1-cubb
 l2adapter_filename: l2_adapter_config_P5G_GH.yaml
 aerial_metrics_backend_address: 127.0.0.1:8081
 
@@ -50,7 +50,7 @@ cuphydriver_config:
   dpdk_file_prefix: cuphycontroller
   nics:
     - nic: '0000:01:00.0'
-      mtu: 9216
+      mtu: 8192
       cpu_mbufs: 196608
       uplane_tx_handles: 64
       txq_size: 8192
@@ -172,25 +172,6 @@ cuphydriver_config:
   enable_l1_param_sanity_check: 0
   pusch_nMaxLdpcHetConfigs: 32
   notify_ul_harq_buffer_release: 0
-
-  # data_config:
-    # datalake_core: 12           # This must be set for Data Lake and/or E3 Agent to be used
-    # datalake_db_write_enable: 1   # Enable/disable ClickHouse writes based on datalake_data_types
-    # datalake_samples: 1000000
-    # datalake_address: localhost
-    # datalake_engine: "MergeTree() PRIMARY KEY (TsTaiNs)"
-    # # datalake_drop_tables: 0   # Set to 1 to drop Clickhouse tables at startup
-    # datalake_data_types: [fh, pusch, hest]  # Data types to write to ClickHouse DB (all types always collected in memory for E3 Agent):
-                                            # fh = Fronthaul IQ samples,pusch = PUSCH/FAPI data, hest = channel estimates
-    # datalake_store_failed_pdu: 0      # Set to 1 to store PDU data even when CRC fails
-    # e3_agent_enable: 0          # Enable/disable E3 Agent and dApp capabilities
-    # num_rows_fh: 120
-    # num_rows_pusch: 200
-    # num_rows_hest: 140
-    # e3_pub_port: 5555           # E3 publisher port for indication messages
-    # e3_rep_port: 5556           # E3 reply port for E3AP requests
-    # e3_sub_port: 5560           # E3 subscriber port for Manager messages
-
   cells:
     - name: O-RU 0
       cell_id: 1
@@ -220,10 +201,13 @@ cuphydriver_config:
       exponent_ul: 4
       max_amp_ul: 65504
       mu: 1
-      T1a_max_up_ns: 280000
-      T1a_max_cp_ul_ns: 405000
-      Ta4_min_ns: 50000
-      Ta4_max_ns: 331000
+      T1a_max_cp_ul_ns: 392000
+      T1a_min_cp_ul_ns: 36000
+      T1a_max_cp_dl_ns: 464000
+      T1a_min_cp_dl_ns: 7600
+      T1a_max_up_ns: 339000
+      Ta4_min_ns: 84000
+      Ta4_max_ns: 280000
       Tcp_adv_dl_ns: 125000
       ul_u_plane_tx_offset_ns: 280000
       fh_len_range: 0

ci-scripts/yaml_files/sa_gnb_aerial_30MHz/docker-compose.yaml

@@ -19,17 +19,16 @@ services:
     volumes:
       - /lib/modules:/lib/modules
       - /dev/hugepages:/dev/hugepages
-      - /usr/src:/usr/src
+      - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
+      - /run/systemd/system:/run/systemd/system
       - ./cuphycontroller_P5G_WNC_GH.yaml:/opt/nvidia/cuBB/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_WNC_GH.yaml
-      - ./aerial_l1_entrypoint.sh:/opt/nvidia/cuBB/aerial_l1_entrypoint.sh
       - /var/log/aerial:/var/log/aerial
-      - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-3
+    image: nv-cubb:26-1
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
-    command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
+    command: bash -c "/opt/nvidia/cuBB/run-l1.sh"
     healthcheck:
       test: ["CMD-SHELL",'grep -q "L1 is ready!" /tmp/phy.log && echo 0 || echo 1']
       interval: 20s
@@ -49,16 +48,9 @@ services:
     ipc: "container:nv-cubb"
     environment:
       USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,utc_time
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities:
-                - gpu
     network_mode: host
     shm_size: 4096m
+    stdin_open: true
     tty: true
     volumes:
       - ../../conf_files/gnb-vnf.sa.band78.78prb.aerial.conf:/opt/oai-gnb/etc/gnb.conf

ci-scripts/yaml_files/sa_gnb_aerial_ul/aerial_l1_entrypoint.sh

-#!/bin/bash
-# SPDX-License-Identifier: MIT
-
-# Check if cuBB_SDK is defined, if not, use default path
-cuBB_Path="${cuBB_SDK:-/opt/nvidia/cuBB}"
-
-cd "$cuBB_Path" || exit 1
-
-# Restart MPS
-# Export variables
-export CUDA_DEVICE_MAX_CONNECTIONS=8
-export CUDA_MPS_PIPE_DIRECTORY=/var
-export CUDA_MPS_LOG_DIRECTORY=/var
-
-# Stop existing MPS
-echo quit | sudo -E nvidia-cuda-mps-control
-
-# Start MPS
-sudo -E nvidia-cuda-mps-control -d
-sudo -E echo start_server -uid 0 | sudo -E nvidia-cuda-mps-control
-
-# Start cuphycontroller_scf
-# Check if an argument is provided
-if [ $# -eq 0 ]; then
-    # No argument provided, use default value
-    argument="P5G_WNC_GH"
-else
-    # Argument provided, use it
-    argument="$1"
-fi
-
-sudo -E "$cuBB_Path"/build.$(uname -m)/cuPHY-CP/cuphycontroller/examples/cuphycontroller_scf "$argument"
-sudo -E ./build.$(uname -m)/cuPHY-CP/gt_common_libs/nvIPC/tests/pcap/pcap_collect

ci-scripts/yaml_files/sa_gnb_aerial_ul/cuphycontroller_P5G_WNC_GH_ul.yaml

-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-aerial_sdk_version: 25-3-cubb
+aerial_sdk_version: 26-1-cubb
 l2adapter_filename: l2_adapter_config_P5G_GH.yaml
 aerial_metrics_backend_address: 127.0.0.1:8081
 
@@ -50,7 +50,7 @@ cuphydriver_config:
   dpdk_file_prefix: cuphycontroller
   nics:
     - nic: '0000:01:00.0'
-      mtu: 9216
+      mtu: 8192
       cpu_mbufs: 196608
       uplane_tx_handles: 64
       txq_size: 8192
@@ -131,7 +131,7 @@ cuphydriver_config:
   enable_srs: 1
   ue_mode: 0
   mCh_segment_proc_enable: 0
-  pusch_aggr_per_ctx: 9 #3
+  pusch_aggr_per_ctx: 9
   prach_aggr_per_ctx: 2
   pucch_aggr_per_ctx: 4
   srs_aggr_per_ctx: 3
@@ -172,25 +172,6 @@ cuphydriver_config:
   enable_l1_param_sanity_check: 0
   pusch_nMaxLdpcHetConfigs: 32
   notify_ul_harq_buffer_release: 0
-
-  # data_config:
-    # datalake_core: 12           # This must be set for Data Lake and/or E3 Agent to be used
-    # datalake_db_write_enable: 1   # Enable/disable ClickHouse writes based on datalake_data_types
-    # datalake_samples: 1000000
-    # datalake_address: localhost
-    # datalake_engine: "MergeTree() PRIMARY KEY (TsTaiNs)"
-    # # datalake_drop_tables: 0   # Set to 1 to drop Clickhouse tables at startup
-    # datalake_data_types: [fh, pusch, hest]  # Data types to write to ClickHouse DB (all types always collected in memory for E3 Agent):
-                                            # fh = Fronthaul IQ samples,pusch = PUSCH/FAPI data, hest = channel estimates
-    # datalake_store_failed_pdu: 0      # Set to 1 to store PDU data even when CRC fails
-    # e3_agent_enable: 0          # Enable/disable E3 Agent and dApp capabilities
-    # num_rows_fh: 120
-    # num_rows_pusch: 200
-    # num_rows_hest: 140
-    # e3_pub_port: 5555           # E3 publisher port for indication messages
-    # e3_rep_port: 5556           # E3 reply port for E3AP requests
-    # e3_sub_port: 5560           # E3 subscriber port for Manager messages
-
   cells:
     - name: O-RU 0
       cell_id: 1
@@ -220,10 +201,13 @@ cuphydriver_config:
       exponent_ul: 4
       max_amp_ul: 65504
       mu: 1
-      T1a_max_up_ns: 280000
-      T1a_max_cp_ul_ns: 405000
-      Ta4_min_ns: 50000
-      Ta4_max_ns: 331000
+      T1a_max_cp_ul_ns: 392000
+      T1a_min_cp_ul_ns: 36000
+      T1a_max_cp_dl_ns: 464000
+      T1a_min_cp_dl_ns: 7600
+      T1a_max_up_ns: 339000
+      Ta4_min_ns: 84000
+      Ta4_max_ns: 280000
       Tcp_adv_dl_ns: 125000
       ul_u_plane_tx_offset_ns: 280000
       fh_len_range: 0

ci-scripts/yaml_files/sa_gnb_aerial_ul/docker-compose.yaml

@@ -19,17 +19,16 @@ services:
     volumes:
       - /lib/modules:/lib/modules
       - /dev/hugepages:/dev/hugepages
-      - /usr/src:/usr/src
+      - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
+      - /run/systemd/system:/run/systemd/system
       - ./cuphycontroller_P5G_WNC_GH_ul.yaml:/opt/nvidia/cuBB/cuPHY-CP/cuphycontroller/config/cuphycontroller_P5G_WNC_GH.yaml
-      - ./aerial_l1_entrypoint.sh:/opt/nvidia/cuBB/aerial_l1_entrypoint.sh
       - /var/log/aerial:/var/log/aerial
-      - ../../../cmake_targets/share:/opt/cuBB/share
     userns_mode: host
     ipc: "shareable"
-    image: cubb-build:25-3
+    image: nv-cubb:26-1
     environment:
       - cuBB_SDK=/opt/nvidia/cuBB
-    command: bash -c "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
+    command: bash -c "/opt/nvidia/cuBB/run-l1.sh"
     healthcheck:
       test: ["CMD-SHELL",'grep -q "L1 is ready!" /tmp/phy.log && echo 0 || echo 1']
       interval: 20s
@@ -49,14 +48,6 @@ services:
     ipc: "container:nv-cubb"
     environment:
       USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,utc_time
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities:
-                - gpu
     network_mode: host
     shm_size: 4096m
     tty: true