Commit 9409348d authored by Robert Schmidt's avatar Robert Schmidt

Use ninja -k option in CI

Some users of the OAI CI complain that since we build with -Werror, it
is difficult to see all warnings/errors and fix them, necessitating
multiple attempts at times to see all warnings. To allow them to see
more warnings, use ninja option -k10 to keep going after errors, and
show more errors at once.
parent a89aab8d
...@@ -44,6 +44,7 @@ RUN /bin/sh oaienv && \ ...@@ -44,6 +44,7 @@ RUN /bin/sh oaienv && \
--build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt \ --build-e2 --cmake-opt -DXAPP_MULTILANGUAGE=OFF --cmake-opt \
-DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \ -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
--build-lib 'telnetsrv enbscope uescope nrscope' \ --build-lib 'telnetsrv enbscope uescope nrscope' \
--build-tool-opt -k10 \
-w USRP -t Ethernet \ -w USRP -t Ethernet \
--noavx512" && \ --noavx512" && \
echo "---- ldd on executables ----" && \ echo "---- ldd on executables ----" && \
......
...@@ -38,6 +38,7 @@ RUN /bin/sh oaienv && \ ...@@ -38,6 +38,7 @@ RUN /bin/sh oaienv && \
CXXFLAGS="-Werror -fstack-protector-strong" CFLAGS="-Werror -fstack-protector-strong" ./build_oai -c --ninja \ CXXFLAGS="-Werror -fstack-protector-strong" CFLAGS="-Werror -fstack-protector-strong" ./build_oai -c --ninja \
--eNB --gNB --RU --UE --nrUE \ --eNB --gNB --RU --UE --nrUE \
--build-lib "telnetsrv enbscope uescope nrscope" \ --build-lib "telnetsrv enbscope uescope nrscope" \
--build-tool-opt -k10 \
-w USRP -t Ethernet \ -w USRP -t Ethernet \
--noavx512 && \ --noavx512 && \
echo "---- ldd on executables ----" && \ echo "---- ldd on executables ----" && \
......
...@@ -45,6 +45,7 @@ RUN /bin/sh oaienv && \ ...@@ -45,6 +45,7 @@ RUN /bin/sh oaienv && \
-w USRP -t Ethernet \ -w USRP -t Ethernet \
--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 \
--noavx512 \ --noavx512 \
--build-tool-opt -k10 \
--cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \ --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
# Mainly to see if the sanitize option was perfectly executed # Mainly to see if the sanitize option was perfectly executed
echo "---- ldd on executables ----" && \ echo "---- ldd on executables ----" && \
......
...@@ -48,7 +48,7 @@ RUN /bin/sh oaienv && \ ...@@ -48,7 +48,7 @@ RUN /bin/sh oaienv && \
-DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" && \ -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" && \
echo "====== Start of log for cross-build executables ======" && \ echo "====== Start of log for cross-build executables ======" && \
# making always passing so we can analyze the all.txt file # making always passing so we can analyze the all.txt file
ninja dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim lte-softmodem nr-softmodem nr-cuup oairu lte-uesoftmodem nr-uesoftmodem params_libconfig coding rfsimulator telnetsrv > ../../log/all.txt 2>&1; \ ninja -k10 dlsim ulsim ldpctest polartest smallblocktest nr_pbchsim nr_dlschsim nr_ulschsim nr_dlsim nr_ulsim nr_pucchsim nr_prachsim lte-softmodem nr-softmodem nr-cuup oairu lte-uesoftmodem nr-uesoftmodem params_libconfig coding rfsimulator telnetsrv > ../../log/all.txt 2>&1; \
# displaying errors and warnings # displaying errors and warnings
grep -E -A3 "warning:|error:" ../../log/all.txt || true && \ grep -E -A3 "warning:|error:" ../../log/all.txt || true && \
# will fail only if string "errors:" is found # will fail only if string "errors:" is found
......
...@@ -40,4 +40,7 @@ RUN /bin/sh oaienv && \ ...@@ -40,4 +40,7 @@ RUN /bin/sh oaienv && \
mkdir -p log && \ mkdir -p log && \
export CC=/usr/bin/clang && \ export CC=/usr/bin/clang && \
export CXX=/usr/bin/clang++ && \ export CXX=/usr/bin/clang++ && \
CFLAGS="-Werror" CXXFLAGS="-Werror -Wno-vla-cxx-extension" ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --noavx512 --disable-T-Tracer -c CFLAGS="-Werror" CXXFLAGS="-Werror -Wno-vla-cxx-extension" \
./build_oai --phy_simulators --gNB --eNB --nrUE --UE \
--ninja --build-tool-opt -k10 \
--noavx512 --disable-T-Tracer -c
...@@ -54,7 +54,7 @@ RUN /bin/sh oaienv && \ ...@@ -54,7 +54,7 @@ RUN /bin/sh oaienv && \
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
cd cmake_targets && \ cd cmake_targets && \
mkdir -p log && \ mkdir -p log && \
./build_oai -c -w AERIAL --gNB --ninja \ ./build_oai -c -w AERIAL --gNB --ninja --build-tool-opt -k10 \
--cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror"
......
...@@ -38,7 +38,7 @@ RUN dnf install -y libasan libubsan ...@@ -38,7 +38,7 @@ RUN dnf install -y libasan libubsan
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
cd cmake_targets && \ cd cmake_targets && \
mkdir -p log && \ mkdir -p log && \
./build_oai --phy_simulators --ninja --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror ./build_oai --phy_simulators --ninja --build-tool-opt -k10 --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
#start from scratch for target executable #start from scratch for target executable
FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-physim FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-physim
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment