From c5e118871e88ce7e0bd00e7ded8ba025b60bc827 Mon Sep 17 00:00:00 2001
From: Ryan Kuester <kuester@bdti.com>
Date: Mon, 4 Nov 2024 18:58:34 -0600
Subject: [PATCH] ci(bazel): improve logging of bazel CI tests

Improve the logging of Bazel commands run in CI by setting several
options that turn off, e.g., progress messages intended for interactive
shells, and turn on, e.g., more verbose output when something fails.

BUG=#2742
---
 .bazelrc                                                 | 9 +++++++++
 tensorflow/lite/micro/tools/ci_build/test_bazel.sh       | 3 +++
 tensorflow/lite/micro/tools/ci_build/test_bazel_asan.sh  | 4 ++++
 tensorflow/lite/micro/tools/ci_build/test_bazel_msan.sh  | 4 ++++
 .../lite/micro/tools/ci_build/test_bazel_tflite_tools.sh | 2 ++
 5 files changed, 22 insertions(+)

diff --git a/.bazelrc b/.bazelrc
index af0b2fd5985..ec0984ef214 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -33,6 +33,15 @@ build --cxxopt -std=c++17
 # Treat warnings as errors
 build --copt -Werror
 
+# Common options for --config=ci
+build:ci --curses=no 
+build:ci --color=no 
+build:ci --noshow_progress
+build:ci --noshow_loading_progress
+build:ci --show_timestamps
+build:ci --terminal_columns=0
+build:ci --verbose_failures
+
 # When building with the address sanitizer
 # E.g., bazel build --config asan
 build:asan --repo_env CC=clang
diff --git a/tensorflow/lite/micro/tools/ci_build/test_bazel.sh b/tensorflow/lite/micro/tools/ci_build/test_bazel.sh
index b76ba6e2625..a43ef5ed658 100755
--- a/tensorflow/lite/micro/tools/ci_build/test_bazel.sh
+++ b/tensorflow/lite/micro/tools/ci_build/test_bazel.sh
@@ -15,6 +15,7 @@
 # ==============================================================================
 
 set -e
+set -x
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_DIR=${SCRIPT_DIR}/../../../../..
@@ -27,8 +28,10 @@ source tensorflow/lite/micro/tools/ci_build/helper_functions.sh
 # having build_test but that was removed with #194.
 
 CC=clang readable_run bazel build ... \
+  --config=ci \
   --build_tag_filters=-no_oss
 CC=clang readable_run bazel test ... \
+  --config=ci \
   --test_tag_filters=-no_oss --build_tag_filters=-no_oss \
   --test_output=errors
 
diff --git a/tensorflow/lite/micro/tools/ci_build/test_bazel_asan.sh b/tensorflow/lite/micro/tools/ci_build/test_bazel_asan.sh
index 9e025f523bf..a42fc3840d2 100755
--- a/tensorflow/lite/micro/tools/ci_build/test_bazel_asan.sh
+++ b/tensorflow/lite/micro/tools/ci_build/test_bazel_asan.sh
@@ -15,6 +15,7 @@
 # ==============================================================================
 
 set -e
+set -x
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_DIR=${SCRIPT_DIR}/../../../../..
@@ -27,8 +28,11 @@ source tensorflow/lite/micro/tools/ci_build/helper_functions.sh
 # having build_test but that was removed with #194.
 
 CC=clang readable_run bazel build tensorflow/lite/micro/... \
+  --config=ci \
   --config=asan --build_tag_filters=-no_oss,-noasan
+
 CC=clang readable_run bazel test tensorflow/lite/micro/... \
+  --config=ci \
   --config=asan \
   --test_tag_filters=-no_oss,-noasan --build_tag_filters=-no_oss,-noasan \
   --test_output=errors
diff --git a/tensorflow/lite/micro/tools/ci_build/test_bazel_msan.sh b/tensorflow/lite/micro/tools/ci_build/test_bazel_msan.sh
index a0b355a0890..9693f85cd5c 100755
--- a/tensorflow/lite/micro/tools/ci_build/test_bazel_msan.sh
+++ b/tensorflow/lite/micro/tools/ci_build/test_bazel_msan.sh
@@ -15,6 +15,7 @@
 # ==============================================================================
 
 set -e
+set -x
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_DIR=${SCRIPT_DIR}/../../../../..
@@ -27,8 +28,11 @@ source tensorflow/lite/micro/tools/ci_build/helper_functions.sh
 # having build_test but that was removed with #194.
 
 CC=clang readable_run bazel build tensorflow/lite/micro/... \
+  --config=ci \
   --config=msan --build_tag_filters=-no_oss,-nomsan
+
 CC=clang readable_run bazel test tensorflow/lite/micro/... \
+  --config=ci \
   --config=msan \
   --test_tag_filters=-no_oss,-nomsan --build_tag_filters=-no_oss,-nomsan \
   --test_output=errors
diff --git a/tensorflow/lite/micro/tools/ci_build/test_bazel_tflite_tools.sh b/tensorflow/lite/micro/tools/ci_build/test_bazel_tflite_tools.sh
index 9556cffd8d7..979d3fdbf55 100755
--- a/tensorflow/lite/micro/tools/ci_build/test_bazel_tflite_tools.sh
+++ b/tensorflow/lite/micro/tools/ci_build/test_bazel_tflite_tools.sh
@@ -15,6 +15,7 @@
 # ==============================================================================
 
 set -e
+set -x
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_DIR=${SCRIPT_DIR}/../../../../..
@@ -23,4 +24,5 @@ cd "${ROOT_DIR}"
 source tensorflow/lite/micro/tools/ci_build/helper_functions.sh
 
 readable_run bazel test tensorflow/lite/tools/... \
+  --config=ci \
   --test_output=errors