From dee0807147371dac84c076ca83be294736a5e055 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 10 Jan 2017 11:13:26 -0500
Subject: [PATCH] vmcheck: Scrape out the journal on failure

So we can debug things more easily.

Closes: #560
Approved by: jlebon
---
 .redhat-ci.yml        |  1 +
 tests/vmcheck/test.sh | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.redhat-ci.yml b/.redhat-ci.yml
index 08f7ec4a..0c205e18 100644
--- a/.redhat-ci.yml
+++ b/.redhat-ci.yml
@@ -75,6 +75,7 @@ tests:
 
 artifacts:
   - vmcheck.log
+  - vmcheck-journal.txt
 
 ---
 
diff --git a/tests/vmcheck/test.sh b/tests/vmcheck/test.sh
index 60c4dec3..a03b0e99 100755
--- a/tests/vmcheck/test.sh
+++ b/tests/vmcheck/test.sh
@@ -38,6 +38,7 @@ vm_cmd mv /etc/yum.repos.d{,.bak}
 vm_cmd mkdir /etc/yum.repos.d
 
 LOG=${LOG:-"$PWD/vmcheck.log"}
+origdir=$(pwd)
 echo -n '' > ${LOG}
 
 testdir="$(dirname $(realpath $0))"
@@ -114,12 +115,26 @@ for tf in $(find . -name 'test-*.sh' | sort); do
       vm_cmd ostree admin deploy vmcheck &>> ${LOG}
       vm_reboot
     fi
+
 done
 
 # put back the original yum repos
 vm_cmd rm -rf /etc/yum.repos.d
 vm_cmd mv /etc/yum.repos.d{.bak,}
 
+# Gather post-failure system logs if necessary
+ALL_LOGS=$LOG
+if [ ${fail} -ne 0 ]; then
+    ALL_LOGS="$ALL_LOGS vmcheck-journal.txt"
+    vmcheck_journal=${origdir}/vmcheck-journal.txt
+    if ! vm_ssh_wait 30; then
+        echo "WARNING: Failed to wait for final reboot" > ${vmcheck_journal}
+    else
+        echo "Saving vmcheck-journal.txt"
+        vm_cmd 'journalctl --no-pager || true' > ${vmcheck_journal}
+    fi
+fi
+
 # tear down ssh connection if needed
 if $SSH -O check &>/dev/null; then
     $SSH -O exit &>/dev/null
@@ -127,5 +142,5 @@ fi
 
 [ ${fail} -eq 0 ] && printer=pass || printer=fail
 ${printer}_print "TOTAL: $total PASS: $pass SKIP: $skip FAIL: $fail"
-echo "See ${LOG} for more information."
+echo "See ${ALL_LOGS} for more information."
 [ ${fail} -eq 0 ]