From e33c70b0925c733576bb363fdef09c361a0ee561 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Tue, 25 Feb 2014 15:16:14 -0500
Subject: [PATCH] add some helpfulness to our log output

this makes it more explicit what's going on in devstack gate, some
sane time ranges for operations (so people can figure out if they
are hung), and pointers to logs for each stage.

Change-Id: I3dac0ab7f7f637698753ab9398a8cd6da269017d
---
 devstack-vm-gate-wrap.sh | 17 +++++++++++++----
 devstack-vm-gate.sh      |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index bd4b8ac5..afbe7940 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -262,18 +262,22 @@ indent ip neighbor show
 echo "Available disk space on this host:"
 indent df -h
 
-echo "Setting up the host ..."
+echo "Setting up the host"
+echo "... this takes a few seconds (logs at logs/devstack-gate-setup-host.txt.gz)"
 tsfilter setup_host &> $WORKSPACE/logs/devstack-gate-setup-host.txt
 
 if [ "$DEVSTACK_GATE_GRENADE" -eq "1" -o "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
-    echo "Setting up the new (migrate to) workspace ..."
+    echo "Setting up the new (migrate to) workspace"
+    echo "... this takes 3 - 5 minutes (logs at logs/devstack-gate-setup-workspace-new.txt.gz)"
     tsfilter setup_workspace $GRENADE_NEW_BRANCH $BASE/new &> \
         $WORKSPACE/logs/devstack-gate-setup-workspace-new.txt
     echo "Setting up the old (migrate from) workspace ..."
+    echo "... this takes 3 - 5 minutes (logs at logs/devstack-gate-setup-workspace-old.txt.gz)"
     tsfilter setup_workspace $GRENADE_OLD_BRANCH $BASE/old &> \
         $WORKSPACE/logs/devstack-gate-setup-workspace-old.txt
 else
-    echo "Setting up workspace ..."
+    echo "Setting up the workspace"
+    echo "... this takes 3 - 5 minutes (logs at logs/devstack-gate-setup-workspace-new.txt.gz)"
     tsfilter setup_workspace $OVERRIDE_ZUUL_BRANCH $BASE/new &> \
         $WORKSPACE/logs/devstack-gate-setup-workspace-new.txt
 fi
@@ -300,6 +304,10 @@ gate_hook
 GATE_RETVAL=$?
 RETVAL=$GATE_RETVAL
 
+if [ $GATE_RETVAL -ne 0 ]; then
+    echo "ERROR: gate_hook failed"
+fi
+
 # Run post test hook if we have one
 if [ $GATE_RETVAL -eq 0 ] && function_exists "post_test_hook"; then
   echo "Running post_test_hook"
@@ -318,7 +326,8 @@ if [ $GATE_RETVAL -eq 137 ] && [ -f $WORKSPACE/gate.pid ] ; then
     sudo kill -s 9 -${GATEPID}
 fi
 
-echo "Cleaning up host..."
+echo "Cleaning up host"
+echo "... this takes 3 - 4 minutes (logs at logs/devstack-gate-cleanup-host.txt.gz)"
 tsfilter cleanup_host &> $WORKSPACE/devstack-gate-cleanup-host.txt
 sudo mv $WORKSPACE/devstack-gate-cleanup-host.txt $BASE/logs/
 
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 112f0036..3fc02e28 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -274,7 +274,7 @@ else
     sudo chown -R stack:stack $BASE
 
     echo "Running devstack"
-    echo "... this will take 5 - 8 minutes"
+    echo "... this takes 5 - 8 minutes (logs in logs/devstacklog.txt.gz)"
     sudo -H -u stack stdbuf -oL -eL ./stack.sh > /dev/null
 
     # provide a check that the right db was running