x/xenapi-os-testing
Code Issues Proposed changes

Updated to allow disowning of the run_tests process

Browse Source
This commit is contained in:
Bob Ball 2014-02-15 12:13:09 +00:00
parent d6f6a4359f
commit 4b4441390c
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
disown_child.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
THISDIR=$(dirname $(readlink -f $0))
$THISDIR/$1 </dev/null &
disown

25
run_tests.sh Normal file → Executable file
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
exec > run_tests.log 2>&1
set -ex set -ex
#REPLACE_ENV #REPLACE_ENV
@ -59,8 +61,8 @@ export SKIP_DEVSTACK_GATE_PROJECT=1
sudo pip install -i https://pypi.python.org/simple/ XenAPI sudo pip install -i https://pypi.python.org/simple/ XenAPI
# These came from the Readme # These came from the Readme
export REPO_URL=https://review.openstack.org/p export ZUUL_URL=https://review.openstack.org/p
export ZUUL_URL=/home/jenkins/workspace-cache export REPO_URL=/home/jenkins/workspace-cache
export WORKSPACE=/home/jenkins/workspace/testing export WORKSPACE=/home/jenkins/workspace/testing
# Check out a custom branch # Check out a custom branch
@ -107,4 +109,21 @@ git clone https://github.com/matelakat/devstack-gate -b xenserver-integration
#( sudo mkdir -p /opt/stack/new && sudo chown -R jenkins:jenkins /opt/stack/new && cd /opt/stack/new && git clone https://github.com/matelakat/devstack-gate -b xenserver-integration ) #( sudo mkdir -p /opt/stack/new && sudo chown -R jenkins:jenkins /opt/stack/new && cd /opt/stack/new && git clone https://github.com/matelakat/devstack-gate -b xenserver-integration )
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
# Trap the exit code + log a final message
function trapexit {
exit_code=$?
if [ $exit_code -eq 0 ]; then
echo "Final result: Tests passed"
else
echo "Final result: Tests failed"
fi
# Do not use 'exit' - bash will preserve the status
}
trap trapexit EXIT
# OpenStack doesn't care much about unset variables...
set +ue
source ./safe-devstack-vm-gate-wrap.sh