maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/aerial-25_1' into integration_2025_w26 (!3477)

Browse Source 
CI: Upgrade Aerial version to 25-1

- Update the Nvidia L1 (cuBB) from version 24-3 to 25-1
- Decrease the number of cores dedicated to the OAI gNB; testing showed
  it does not need that many
This commit is contained in:
Jaroslava Fiedlerova
2025-06-25 12:59:54 +02:00
parent 8db35e468d 833edb3b25
commit c22e7d22c4
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/cls_containerize.py
+2 -2
View File
@@ -498,10 +498,10 @@ class Containerize():
elif image != 'ran-build': elif image != 'ran-build':
cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}') cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
if image == 'oai-gnb-aerial': if image == 'oai-gnb-aerial':
cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.*.tar.gz .') cmd.run('cp -f /opt/nvidia-ipc/nvipc.src.2025.05.20.tar.gz .')
ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200) ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
if image == 'oai-gnb-aerial': if image == 'oai-gnb-aerial':
cmd.run('rm -f nvipc_src.*.tar.gz') cmd.run('rm -f nvipc.src.2025.05.20.tar.gz')
if image == 'ran-build' and ret.returncode == 0: if image == 'ran-build' and ret.returncode == 0:
cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true") cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/") cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
ci-scripts/yaml_files/sa_gnb_aerial/docker-compose.yaml
+2 -2
View File
@@ -23,7 +23,7 @@ services:
- ../../../cmake_targets/share:/opt/cuBB/share - ../../../cmake_targets/share:/opt/cuBB/share
userns_mode: host userns_mode: host
ipc: "shareable" ipc: "shareable"
image: cubb-build:24-3 image: cubb-build:25-1
environment: environment:
- cuBB_SDK=/opt/nvidia/cuBB - 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 "sudo rm -rf /tmp/phy.log && sudo chmod +x /opt/nvidia/cuBB/aerial_l1_entrypoint.sh && /opt/nvidia/cuBB/aerial_l1_entrypoint.sh"
@@ -33,7 +33,7 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-gnb-aerial: oai-gnb-aerial:
cpuset: "13-20" cpuset: "13-14"
image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-aerial:${TAG:-develop} image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-aerial:${TAG:-develop}
depends_on: depends_on:
nv-cubb: nv-cubb:
docker/Dockerfile.gNB.aerial.ubuntu22
+1 -1
View File
@@ -45,7 +45,7 @@ WORKDIR /oai-ran
COPY . . COPY . .
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
tar -xvzf nvipc_src.*.tar.gz && \ tar -xvzf nvipc* && \
cd nvipc_src.* && \ cd nvipc_src.* && \
rm -rf build && mkdir build && cd build && \ rm -rf build && mkdir build && cd build && \
cmake .. -DNVIPC_DPDK_ENABLE=OFF -DNVIPC_DOCA_ENABLE=OFF -DNVIPC_CUDA_ENABLE=OFF -DENABLE_SLT_RSP=ON && \ cmake .. -DNVIPC_DPDK_ENABLE=OFF -DNVIPC_DOCA_ENABLE=OFF -DNVIPC_CUDA_ENABLE=OFF -DENABLE_SLT_RSP=ON && \
docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address
+1 -1
View File
@@ -45,7 +45,7 @@ WORKDIR /oai-ran
COPY . . COPY . .
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
tar -xvzf nvipc_src.*.tar.gz && \ tar -xvzf nvipc* && \
cd nvipc_src.* && \ cd nvipc_src.* && \
rm -rf build && mkdir build && cd build && \ rm -rf build && mkdir build && cd build && \
cmake .. -DNVIPC_DPDK_ENABLE=OFF -DNVIPC_DOCA_ENABLE=OFF -DNVIPC_CUDA_ENABLE=OFF -DENABLE_SLT_RSP=ON && \ cmake .. -DNVIPC_DPDK_ENABLE=OFF -DNVIPC_DOCA_ENABLE=OFF -DNVIPC_CUDA_ENABLE=OFF -DENABLE_SLT_RSP=ON && \