From b91ad8fa0950c752ab08af7d08727d5a97b14b12 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Fri, 8 Nov 2019 16:39:25 -0800 Subject: [PATCH] test: merge log files of all shards for each test suite This significantly speeds up a process of uploading this files to sponge and resultstore by kokoro. PiperOrigin-RevId: 279416349 --- scripts/common_bazel.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/common_bazel.sh b/scripts/common_bazel.sh index f8ec967b1..a82163297 100755 --- a/scripts/common_bazel.sh +++ b/scripts/common_bazel.sh @@ -71,6 +71,13 @@ function run_as_root() { function collect_logs() { # Zip out everything into a convenient form. if [[ -v KOKORO_ARTIFACTS_DIR ]] && [[ -e bazel-testlogs ]]; then + # Merge results files of all shards for each test suite. + for d in `find -L "bazel-testlogs" -name 'shard_*_of_*' | xargs dirname | sort | uniq`; do + junitparser merge `find $d -name test.xml` $d/test.xml + cat $d/shard_*_of_*/test.log > $d/test.log + ls -l $d/shard_*_of_*/outputs.zip && zip -r -1 $d/outputs.zip $d/shard_*_of_*/outputs.zip + done + find -L "bazel-testlogs" -name 'shard_*_of_*' | xargs rm -rf # Move test logs to Kokoro directory. tar is used to conveniently perform # renames while moving files. find -L "bazel-testlogs" -name "test.xml" -o -name "test.log" -o -name "outputs.zip" |