From 77ff259d33d1bfda2dabedc423a331a781ef0e49 Mon Sep 17 00:00:00 2001 From: Tomasz Michalak Date: Thu, 18 Apr 2019 14:10:23 +0200 Subject: [PATCH] infra: Disable script abort for database generation Signed-off-by: Tomasz Michalak --- .github/kokoro/db-full.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh index 8ece01dc..2a670fd7 100755 --- a/.github/kokoro/db-full.sh +++ b/.github/kokoro/db-full.sh @@ -53,9 +53,10 @@ echo "----------------------------------------" # - 074 completes in ~60 minutes # which is well before the 05x INT fuzzers complete. export MAX_VIVADO_PROCESS=$((CORES/2 < 20 ? CORES/2 : 20)) - set -x + set -x +e script --return --flush --command "make -j $CORES MAX_VIVADO_PROCESS=$MAX_VIVADO_PROCESS" - - set +x + DATABASE_RET=$? + set +x -e echo "----------------------------------------" # Collect the Vivado logs into one tgz archive @@ -63,6 +64,11 @@ echo "----------------------------------------" find . -name vivado.log | xargs tar -czvf vivado.tgz echo "----------------------------------------" + if [[ $DATABASE_RET != 0 ]] ; then + echo "A failure occurred during Database build." + exit $DATABASE_RET + fi + # Check there is nothing to do after running... echo if [ $(make --dry-run | grep -v 'Nothing to be done' | wc -l) -gt 0 ]; then