Merge "Use scripts from horizon repo in integration job test hooks"
This commit is contained in:
commit
59aa3abd58
@ -35,17 +35,18 @@
|
||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
|
||||
function pre_test_hook {
|
||||
cd /opt/stack/new/horizon/tools/gate/integration
|
||||
./pre_test_hook.sh
|
||||
}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {
|
||||
local retval
|
||||
cd /opt/stack/new/horizon
|
||||
sudo -H -u stack tox -e py27integration
|
||||
retval=$?
|
||||
if [ -d openstack_dashboard/test/integration_tests/integration_tests_screenshots/ ]; then
|
||||
cp -r openstack_dashboard/test/integration_tests/integration_tests_screenshots/ /home/jenkins/workspace/gate-horizon-dsvm-integration/
|
||||
fi
|
||||
return $retval
|
||||
cd /opt/stack/new/horizon/tools/gate/integration
|
||||
./post_test_hook.sh
|
||||
}
|
||||
export -f post_test_hook
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user