openstack/bifrost
Code Issues Proposed changes

Separate log collection into its own script

Browse Source 
Avoid having too much duplicated stuff by moving log
collection into its own script as suggested in
https://review.openstack.org/#/c/264366/1/scripts/test-bifrost-venv.sh@80

Change-Id: I2e322fc1f12e270c9407e7320d0d0e8c5452c4af
This commit is contained in:
stephane 2016-01-27 09:04:16 -08:00
parent bda0db18b1
commit 6457561b21
3 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/collect-test-info.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/bash
set -eux
set -o pipefail
# Note(TheJulia): If there is a workspace variable, we want to utilize that as
# the preference of where to put logs
SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)"
LOG_LOCATION="${WORKSPACE:-${SCRIPT_HOME}/..}/logs"
echo "Making logs directory and collecting logs."
[ -d ${LOG_LOCATION} ] || mkdir -p ${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

20
scripts/test-bifrost-build-images.sh
View File

@ -1,9 +1,5 @@
#!/bin/bash #!/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 -eux
set -o pipefail set -o pipefail
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
@ -58,17 +54,7 @@ if [ $EXITCODE != 0 ]; then
echo "Test failed. See logs folder" echo "Test failed. See logs folder"
echo "****************************" echo "****************************"
fi fi
echo "Making logs directory and collecting logs."
mkdir ${LOG_LOCATION} $SCRIPT_HOME/collect-test-info.sh
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
sudo cp /var/log/upstart/ironic-inspector.log ${LOG_LOCATION}/
sudo chown $USER ${LOG_LOCATION}/ironic-inspector.log
exit $EXITCODE exit $EXITCODE

18
scripts/test-bifrost.sh
View File

@ -1,9 +1,5 @@
#!/bin/bash #!/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 -eux
set -o pipefail set -o pipefail
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
@ -57,15 +53,7 @@ if [ $EXITCODE != 0 ]; then
echo "Test failed. See logs folder" echo "Test failed. See logs folder"
echo "****************************" echo "****************************"
fi fi
echo "Making logs directory and collecting logs."
mkdir ${LOG_LOCATION} $SCRIPT_HOME/collect-test-info.sh
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 exit $EXITCODE