From 2e45e534aef1eda88fa43c8eaa49cf4cf910e919 Mon Sep 17 00:00:00 2001
From: Tomasz Michalak <tmichalak@antmicro.com>
Date: Tue, 28 May 2019 11:42:13 +0200
Subject: [PATCH] kokoro: Pack failing test cases instead of vivado logs

Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>
---
 .github/kokoro/continuous-db-artix7.cfg  |  2 +-
 .github/kokoro/continuous-db-kintex7.cfg |  2 +-
 .github/kokoro/continuous-db-zynq7.cfg   |  2 +-
 .github/kokoro/db-full.sh                | 15 ++++++++-------
 .github/kokoro/kokoro-cfg.py             |  2 +-
 .github/kokoro/presubmit-db-artix7.cfg   |  2 +-
 .github/kokoro/presubmit-db-kintex7.cfg  |  2 +-
 .github/kokoro/presubmit-db-zynq7.cfg    |  2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/kokoro/continuous-db-artix7.cfg b/.github/kokoro/continuous-db-artix7.cfg
index e26ebbf2..279f953c 100644
--- a/.github/kokoro/continuous-db-artix7.cfg
+++ b/.github/kokoro/continuous-db-artix7.cfg
@@ -12,7 +12,7 @@ action {
     regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
-    regex: "**/fuzzers/vivado.tgz"
+    regex: "**/fuzzers/*.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 f8412947..04495846 100644
--- a/.github/kokoro/continuous-db-kintex7.cfg
+++ b/.github/kokoro/continuous-db-kintex7.cfg
@@ -12,7 +12,7 @@ action {
     regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
-    regex: "**/fuzzers/vivado.tgz"
+    regex: "**/fuzzers/*.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 52636cf4..3931f3f2 100644
--- a/.github/kokoro/continuous-db-zynq7.cfg
+++ b/.github/kokoro/continuous-db-zynq7.cfg
@@ -12,7 +12,7 @@ action {
     regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
-    regex: "**/fuzzers/vivado.tgz"
+    regex: "**/fuzzers/*.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 5cef9d64..2fa14180 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -54,18 +54,19 @@ echo "----------------------------------------"
 	# which is well before the 05x INT fuzzers complete.
 	export MAX_VIVADO_PROCESS=$((CORES/2 < 20 ? CORES/2 : 20))
 	set -x +e
-	script --return --flush --command "make -j $CORES MAX_VIVADO_PROCESS=$MAX_VIVADO_PROCESS" -
+	tmp=`mktemp`
+	script --return --flush --command "make -j $CORES MAX_VIVADO_PROCESS=$MAX_VIVADO_PROCESS" $tmp
 	DATABASE_RET=$?
 	set +x -e
-	echo "----------------------------------------"
-
-	# Collect the Vivado logs into one tgz archive
-	echo "Collecting Vivado logs"
-	find . -name vivado.log | xargs tar -czvf vivado.tgz
-	echo "----------------------------------------"
 
 	if [[ $DATABASE_RET != 0 ]] ; then
+		# Collect the Vivado logs into one tgz archive
+		echo "Packing failing test cases"
+		grep "recipe for target" $tmp | awk 'match($0,/recipe for target.*'\''(.*)\/run.ok'\''/,res) {print res[1]}' | xargs tar -zcf fails.tgz
+		echo "----------------------------------------"
 		echo "A failure occurred during Database build."
+		echo "----------------------------------------"
+		rm $tmp
 		exit $DATABASE_RET
 	fi
 
diff --git a/.github/kokoro/kokoro-cfg.py b/.github/kokoro/kokoro-cfg.py
index 213abe81..1390bf03 100755
--- a/.github/kokoro/kokoro-cfg.py
+++ b/.github/kokoro/kokoro-cfg.py
@@ -15,7 +15,7 @@ action {
     regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
-    regex: "**/fuzzers/vivado.tgz"
+    regex: "**/fuzzers/*.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 901fe88d..e3fd664b 100644
--- a/.github/kokoro/presubmit-db-artix7.cfg
+++ b/.github/kokoro/presubmit-db-artix7.cfg
@@ -12,7 +12,7 @@ action {
     regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
-    regex: "**/fuzzers/vivado.tgz"
+    regex: "**/fuzzers/*.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 b96398a0..bfe4f62b 100644
--- a/.github/kokoro/presubmit-db-kintex7.cfg
+++ b/.github/kokoro/presubmit-db-kintex7.cfg
@@ -12,7 +12,7 @@ action {
     regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
-    regex: "**/fuzzers/vivado.tgz"
+    regex: "**/fuzzers/*.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 3c648098..31210fec 100644
--- a/.github/kokoro/presubmit-db-zynq7.cfg
+++ b/.github/kokoro/presubmit-db-zynq7.cfg
@@ -12,7 +12,7 @@ action {
     regex: "**/diff.patch"
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
-    regex: "**/fuzzers/vivado.tgz"
+    regex: "**/fuzzers/*.tgz"
     # Whole directories
     # regex: "**/build/**" - Currently kokoro dies on number of artifacts.
     regex: "**/build/*.log"