openstack/project-config
Code Issues Proposed changes

Merge "Use scripts from horizon repo in integration job test hooks"

Browse Source
This commit is contained in:
Jenkins 2016-01-13 15:03:59 +00:00 committed by Gerrit Code Review
commit 59aa3abd58
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jenkins/jobs/horizon.yaml
View File

@ -35,17 +35,18 @@
export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_NEUTRON=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 { function post_test_hook {
local retval cd /opt/stack/new/horizon/tools/gate/integration
cd /opt/stack/new/horizon ./post_test_hook.sh
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
} }
export -f post_test_hook export -f post_test_hook
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 ./safe-devstack-vm-gate-wrap.sh