From 50e398e8ea6c78ddf4c0a245e580cae03326e991 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Thu, 29 Dec 2011 16:36:59 -0800
Subject: [PATCH] Syslog devstack and archive log.

Enable syslogging in devstack.
Copy the syslog back to the Jenkins workspace for archiving.

Change-Id: I7f9f21891bce0031190caec6a5f593838dfd7a23
---
 slave_scripts/devstack-vm-gate-host.sh | 6 ++++++
 slave_scripts/devstack-vm-gate.sh      | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/slave_scripts/devstack-vm-gate-host.sh b/slave_scripts/devstack-vm-gate-host.sh
index 08b13bd7..4f3feeec 100755
--- a/slave_scripts/devstack-vm-gate-host.sh
+++ b/slave_scripts/devstack-vm-gate-host.sh
@@ -50,6 +50,7 @@ ROOTSLEEP=0
 ENABLED_SERVICES=g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,mysql,rabbit
 SKIP_EXERCISES=swift,volumes
 SERVICE_HOST=127.0.0.1
+SYSLOG=True
 EOF
 
 # The vm template update job should cache some images in ~/files.
@@ -58,5 +59,10 @@ if ls ~/cache/files/*; then
     mv ~/cache/files/* /opt/stack/devstack/files
 fi
 
+# Start with a fresh syslog
+sudo stop rsyslog
+sudo mv /var/log/syslog /var/log/syslog-pre-devstack
+sudo start rsyslog
+
 ./stack.sh
 ./exercise.sh
diff --git a/slave_scripts/devstack-vm-gate.sh b/slave_scripts/devstack-vm-gate.sh
index c503f7bb..176dda63 100755
--- a/slave_scripts/devstack-vm-gate.sh
+++ b/slave_scripts/devstack-vm-gate.sh
@@ -26,6 +26,7 @@ ALWAYS_KEEP=${ALWAYS_KEEP:-0}
 
 CI_SCRIPT_DIR=$(cd $(dirname "$0") && pwd)
 cd $WORKSPACE
+mkdir -p logs
 
 for PROJECT in $PROJECTS
 do
@@ -81,9 +82,13 @@ fi
 
 ssh $NODE_IP_ADDR ./devstack-vm-gate-host.sh
 RETVAL=$?
+# No matter what, archive logs
+scp -C -q $NODE_IP_ADDR:/var/log/syslog $WORKSPACE/logs/
+# Now check whether the run was a success
 if [ $RETVAL = 0 ] && [ $ALWAYS_KEEP = 0 ]; then
     echo "Deleting host"
     $CI_SCRIPT_DIR/devstack-vm-delete.py $NODE_UUID
+    exit $RETVAL
 else
     #echo "Giving host to developer"
     #$CI_SCRIPT_DIR/devstack-vm-give.py $NODE_UUID