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

Merge remote-tracking branch 'origin/ci-fix-dockerfile-for-fhi-build' into integration_2025_w02 (!3186)

Browse Source 
chore(ci): improved errors messages visibility

1. There was a trailing && before $BUILD_OPTIONS in the command line
2. Added leading lines and more pattern to the grep command that
   displays errors/warnings messages during docker build since we don't
   have access to all.txt if build fails
This commit is contained in:
Robert Schmidt
2025-01-10 07:57:13 +01:00
parent 7720d7c821 1b9fcc9858
commit 8fd6f1c611
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/tools/build_helper
+1 -1
View File
@@ -226,7 +226,7 @@ compilations() {
ret=$? ret=$?
} > $dlog/$logfile 2>&1 } > $dlog/$logfile 2>&1
# Print the errors and warnings for CI purposes # Print the errors and warnings for CI purposes
grep -E -A3 "warning:|error:" $dlog/$logfile || true grep -E -A5 -B5 "warning:|error:| Error " $dlog/$logfile || true
check_warnings "$dlog/$logfile" check_warnings "$dlog/$logfile"
if [[ $ret -eq 0 ]]; then if [[ $ret -eq 0 ]]; then
echo_success "$targets compiled" echo_success "$targets compiled"
docker/Dockerfile.build.fhi72.ubuntu22
+1 -1
View File
@@ -71,7 +71,7 @@ RUN /bin/sh oaienv && \
--gNB \ --gNB \
--build-lib "telnetsrv enbscope uescope nrscope" \ --build-lib "telnetsrv enbscope uescope nrscope" \
-t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \ -t oran_fhlib_5g --cmake-opt -Dxran_LOCATION=/opt/phy/fhi_lib/lib \
--build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION && \ --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
$BUILD_OPTION && \ $BUILD_OPTION && \
# Mainly to see if the sanitize option was perfectly executed # Mainly to see if the sanitize option was perfectly executed
ldd ran_build/build/nr-softmodem && \ ldd ran_build/build/nr-softmodem && \