From 37b0c9ce7672182b0a306ef4f39133e887649ec9 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Mon, 31 Aug 2015 08:55:04 -0400
Subject: [PATCH] Correct log file storage location

Due to zuul jenkins-job-builder changes, the base folder the CI
job was being executed changed.  This is okay, however the log
collection script only looks in the root of the WORKSPACE folder
if present, so we need to identify and default to that folder if
defined.

Change-Id: I76a2a23e2a75022bae3511700c81145b5cbeae77
Closes-Bug: 1490532
---
 scripts/test-bifrost-build-images.sh | 25 +++++++++++++++----------
 scripts/test-bifrost.sh              | 25 +++++++++++++++----------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/scripts/test-bifrost-build-images.sh b/scripts/test-bifrost-build-images.sh
index 87a92812c..7738d438a 100755
--- a/scripts/test-bifrost-build-images.sh
+++ b/scripts/test-bifrost-build-images.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# Note(TheJulia): If there is a workspace variable, we want to utilize that as
+# the preference of where to put logs
+LOG_LOCATION=${WORKSPACE:-../logs}
+
 set -eux
 set -o pipefail
 export PYTHONUNBUFFERED=1
@@ -51,14 +56,14 @@ if [ $EXITCODE != 0 ]; then
     echo "****************************"
 fi
 echo "Making logs directory and collecting logs."
-mkdir ../logs
-sudo cp /var/log/libvirt/baremetal_logs/testvm1_console.log ../logs/
-sudo chown $USER ../logs/testvm1_console.log
-dmesg &> ../logs/dmesg.log
-sudo netstat -apn &> ../logs/netstat.log
-sudo iptables -L -n -v &> ../logs/iptables.log
-sudo cp /var/log/upstart/ironic-api.log ../logs/
-sudo chown $USER ../logs/ironic-api.log
-sudo cp /var/log/upstart/ironic-conductor.log ../logs/
-sudo chown $USER ../logs/ironic-conductor.log
+mkdir ${LOG_LOCATION}
+sudo cp /var/log/libvirt/baremetal_logs/testvm1_console.log ${LOG_LOCATION}/
+sudo chown $USER ${LOG_LOCATION}/testvm1_console.log
+dmesg &> ${LOG_LOCATION}/dmesg.log
+sudo netstat -apn &> ${LOG_LOCATION}/netstat.log
+sudo iptables -L -n -v &> ${LOG_LOCATION}/iptables.log
+sudo cp /var/log/upstart/ironic-api.log .${LOG_LOCATION}/
+sudo chown $USER ${LOG_LOCATION}/ironic-api.log
+sudo cp /var/log/upstart/ironic-conductor.log ${LOG_LOCATION}/
+sudo chown $USER ${LOG_LOCATION}/ironic-conductor.log
 exit $EXITCODE
diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh
index ee9cf4354..9a772e2eb 100755
--- a/scripts/test-bifrost.sh
+++ b/scripts/test-bifrost.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# Note(TheJulia): If there is a workspace variable, we want to utilize that as
+# the preference of where to put logs
+LOG_LOCATION=${WORKSPACE:-../logs}
+
 set -eux
 set -o pipefail
 export PYTHONUNBUFFERED=1
@@ -47,14 +52,14 @@ if [ $EXITCODE != 0 ]; then
     echo "****************************"
 fi
 echo "Making logs directory and collecting logs."
-mkdir ../logs
-sudo cp /var/log/libvirt/baremetal_logs/testvm1_console.log ../logs/
-sudo chown $USER ../logs/testvm1_console.log
-dmesg &> ../logs/dmesg.log
-sudo netstat -apn &> ../logs/netstat.log
-sudo iptables -L -n -v &> ../logs/iptables.log
-sudo cp /var/log/upstart/ironic-api.log ../logs/
-sudo chown $USER ../logs/ironic-api.log
-sudo cp /var/log/upstart/ironic-conductor.log ../logs/
-sudo chown $USER ../logs/ironic-conductor.log
+mkdir ${LOG_LOCATION}
+sudo cp /var/log/libvirt/baremetal_logs/testvm1_console.log ${LOG_LOCATION}
+sudo chown $USER ${LOG_LOCATION}/testvm1_console.log
+dmesg &> ${LOG_LOCATION}/dmesg.log
+sudo netstat -apn &> ${LOG_LOCATION}/netstat.log
+sudo iptables -L -n -v &> ${LOG_LOCATION}/iptables.log
+sudo cp /var/log/upstart/ironic-api.log ${LOG_LOCATION}/
+sudo chown $USER ${LOG_LOCATION}/ironic-api.log
+sudo cp /var/log/upstart/ironic-conductor.log ${LOG_LOCATION}/
+sudo chown $USER ${LOG_LOCATION}/ironic-conductor.log
 exit $EXITCODE