From 24efc76de012c9b6b4d08b6c5f48fed8f80e63e7 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Thu, 14 Sep 2023 12:15:44 +0200
Subject: [PATCH] chore(ci): removing verbose-ci useless option

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
 cmake_targets/build_oai          | 7 -------
 cmake_targets/tools/build_helper | 5 -----
 docker/Dockerfile.build.rhel9    | 2 +-
 docker/Dockerfile.build.rocky    | 2 +-
 docker/Dockerfile.clang.rhel9    | 2 +-
 docker/Dockerfile.phySim.rhel9   | 2 +-
 6 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 246c45dcda..dbceb680a2 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -38,7 +38,6 @@ gen_nvram_path=$OPENAIR_DIR/cmake_targets/ran_build/build
 conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 
 HW=""
-VERBOSE_CI=0
 VERBOSE_COMPILE=0
 RUN_GROUP=0
 TEST_CASE_GROUP=""
@@ -110,8 +109,6 @@ Options:
    Adds a debgging facility to the binary files: GUI with major internal synchronization events
 -x | --xforms
    Will compile with software oscilloscope features
---verbose-ci
-   Compile with verbose instructions in CI Docker env
 --verbose-compile
    Shows detailed compilation instructions in makefile
 --build-doxygen
@@ -336,10 +333,6 @@ function main() {
        -x | --xforms)
             echo_info "Will generate the software oscilloscope features"
             shift;;
-       --verbose-ci)
-            VERBOSE_CI=1
-            echo_info "Will compile with verbose instructions in CI Docker env"
-            shift;;
        --verbose-compile)
             VERBOSE_COMPILE=1
             echo_info "Will compile with verbose instructions"
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 4f1ea858a4..bacd781c43 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -233,11 +233,6 @@ compilations() {
     $CMAKE --build . $verbose --target $targets -- -j$(nproc)
     ret=$?
   } > $dlog/$logfile 2>&1
-  if [ "$VERBOSE_CI" == "1" ]; then
-     echo "====== Start of log for $logfile ======"
-     cat $dlog/$logfile
-     echo "====== End of log for $logfile ======"
-  fi
   check_warnings "$dlog/$logfile"
   if [[ $ret -eq 0 ]]; then
      echo_success "$targets compiled"
diff --git a/docker/Dockerfile.build.rhel9 b/docker/Dockerfile.build.rhel9
index 1a12843ea4..ff9c312f8c 100644
--- a/docker/Dockerfile.build.rhel9
+++ b/docker/Dockerfile.build.rhel9
@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --noavx512 -c
diff --git a/docker/Dockerfile.build.rocky b/docker/Dockerfile.build.rocky
index 468869b277..10b04d90c0 100644
--- a/docker/Dockerfile.build.rocky
+++ b/docker/Dockerfile.build.rocky
@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope" -w USRP -t Ethernet --noavx512 -c
diff --git a/docker/Dockerfile.clang.rhel9 b/docker/Dockerfile.clang.rhel9
index 654bae8539..b5cb74b0ce 100644
--- a/docker/Dockerfile.clang.rhel9
+++ b/docker/Dockerfile.clang.rhel9
@@ -40,4 +40,4 @@ RUN /bin/sh oaienv && \
     mkdir -p log && \
     export CC=/usr/bin/clang && \
     export CXX=/usr/bin/clang++ && \
-    ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --verbose-ci --noavx512 --disable-T-Tracer -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --phy_simulators --gNB --eNB --nrUE --UE --ninja --noavx512 --disable-T-Tracer -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
diff --git a/docker/Dockerfile.phySim.rhel9 b/docker/Dockerfile.phySim.rhel9
index 223a5bb68a..9935d61979 100644
--- a/docker/Dockerfile.phySim.rhel9
+++ b/docker/Dockerfile.phySim.rhel9
@@ -38,7 +38,7 @@ RUN dnf install -y libasan libubsan
 RUN /bin/sh oaienv && \ 
     cd cmake_targets && \
     mkdir -p log && \
-    ./build_oai --phy_simulators --ninja --verbose-ci --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
+    ./build_oai --phy_simulators --ninja --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror
 
 #start from scratch for target executable
 FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim