From 8794767ecab58c6f941f1df0eafdfb5b5b0ed592 Mon Sep 17 00:00:00 2001 From: Tomasz Michalak Date: Wed, 17 Apr 2019 09:49:16 +0200 Subject: [PATCH 1/2] infra: Collect Vivado logs into tgz archive Signed-off-by: Tomasz Michalak --- .github/kokoro/continuous-db-artix7.cfg | 1 + .github/kokoro/continuous-db-kintex7.cfg | 1 + .github/kokoro/continuous-db-zynq7.cfg | 1 + .github/kokoro/db-full.sh | 5 +++++ .github/kokoro/kokoro-cfg.py | 1 + .github/kokoro/presubmit-db-artix7.cfg | 1 + .github/kokoro/presubmit-db-kintex7.cfg | 1 + .github/kokoro/presubmit-db-zynq7.cfg | 1 + 8 files changed, 12 insertions(+) diff --git a/.github/kokoro/continuous-db-artix7.cfg b/.github/kokoro/continuous-db-artix7.cfg index 0b76ee04..e26ebbf2 100644 --- a/.github/kokoro/continuous-db-artix7.cfg +++ b/.github/kokoro/continuous-db-artix7.cfg @@ -12,6 +12,7 @@ action { regex: "**/diff.patch" regex: "**/*result*.xml" regex: "**/*sponge_log.xml" + regex: "**/fuzzers/vivado.tgz" # Whole directories # regex: "**/build/**" - Currently kokoro dies on number of artifacts. regex: "**/build/*.log" diff --git a/.github/kokoro/continuous-db-kintex7.cfg b/.github/kokoro/continuous-db-kintex7.cfg index 3a29ea8b..f8412947 100644 --- a/.github/kokoro/continuous-db-kintex7.cfg +++ b/.github/kokoro/continuous-db-kintex7.cfg @@ -12,6 +12,7 @@ action { regex: "**/diff.patch" regex: "**/*result*.xml" regex: "**/*sponge_log.xml" + regex: "**/fuzzers/vivado.tgz" # Whole directories # regex: "**/build/**" - Currently kokoro dies on number of artifacts. regex: "**/build/*.log" diff --git a/.github/kokoro/continuous-db-zynq7.cfg b/.github/kokoro/continuous-db-zynq7.cfg index 92d33b06..52636cf4 100644 --- a/.github/kokoro/continuous-db-zynq7.cfg +++ b/.github/kokoro/continuous-db-zynq7.cfg @@ -12,6 +12,7 @@ action { regex: "**/diff.patch" regex: "**/*result*.xml" regex: "**/*sponge_log.xml" + regex: "**/fuzzers/vivado.tgz" # Whole directories # regex: "**/build/**" - Currently kokoro dies on number of artifacts. regex: "**/build/*.log" diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh index 8c4db12a..8ece01dc 100755 --- a/.github/kokoro/db-full.sh +++ b/.github/kokoro/db-full.sh @@ -58,6 +58,11 @@ echo "----------------------------------------" set +x echo "----------------------------------------" + # Collect the Vivado logs into one tgz archive + echo "Collecting Vivado logs" + find . -name vivado.log | xargs tar -czvf vivado.tgz + echo "----------------------------------------" + # Check there is nothing to do after running... echo if [ $(make --dry-run | grep -v 'Nothing to be done' | wc -l) -gt 0 ]; then diff --git a/.github/kokoro/kokoro-cfg.py b/.github/kokoro/kokoro-cfg.py index 994069b7..213abe81 100755 --- a/.github/kokoro/kokoro-cfg.py +++ b/.github/kokoro/kokoro-cfg.py @@ -15,6 +15,7 @@ action { regex: "**/diff.patch" regex: "**/*result*.xml" regex: "**/*sponge_log.xml" + regex: "**/fuzzers/vivado.tgz" # Whole directories # regex: "**/build/**" - Currently kokoro dies on number of artifacts. regex: "**/build/*.log" diff --git a/.github/kokoro/presubmit-db-artix7.cfg b/.github/kokoro/presubmit-db-artix7.cfg index 58670fa2..901fe88d 100644 --- a/.github/kokoro/presubmit-db-artix7.cfg +++ b/.github/kokoro/presubmit-db-artix7.cfg @@ -12,6 +12,7 @@ action { regex: "**/diff.patch" regex: "**/*result*.xml" regex: "**/*sponge_log.xml" + regex: "**/fuzzers/vivado.tgz" # Whole directories # regex: "**/build/**" - Currently kokoro dies on number of artifacts. regex: "**/build/*.log" diff --git a/.github/kokoro/presubmit-db-kintex7.cfg b/.github/kokoro/presubmit-db-kintex7.cfg index 504199da..b96398a0 100644 --- a/.github/kokoro/presubmit-db-kintex7.cfg +++ b/.github/kokoro/presubmit-db-kintex7.cfg @@ -12,6 +12,7 @@ action { regex: "**/diff.patch" regex: "**/*result*.xml" regex: "**/*sponge_log.xml" + regex: "**/fuzzers/vivado.tgz" # Whole directories # regex: "**/build/**" - Currently kokoro dies on number of artifacts. regex: "**/build/*.log" diff --git a/.github/kokoro/presubmit-db-zynq7.cfg b/.github/kokoro/presubmit-db-zynq7.cfg index 12421619..3c648098 100644 --- a/.github/kokoro/presubmit-db-zynq7.cfg +++ b/.github/kokoro/presubmit-db-zynq7.cfg @@ -12,6 +12,7 @@ action { regex: "**/diff.patch" regex: "**/*result*.xml" regex: "**/*sponge_log.xml" + regex: "**/fuzzers/vivado.tgz" # Whole directories # regex: "**/build/**" - Currently kokoro dies on number of artifacts. regex: "**/build/*.log" From 77ff259d33d1bfda2dabedc423a331a781ef0e49 Mon Sep 17 00:00:00 2001 From: Tomasz Michalak Date: Thu, 18 Apr 2019 14:10:23 +0200 Subject: [PATCH 2/2] 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