Merge "Fix neutron func job to use gate-specific tox env"

This commit is contained in:
Jenkins 2014-07-29 17:36:35 +00:00 committed by Gerrit Code Review
commit 6530683434

View File

@ -26,14 +26,11 @@
function post_test_hook {{ function post_test_hook {{
$BASE/new/devstack/unstack.sh $BASE/new/devstack/unstack.sh
# TODO(HenryG): this isn't actually passed through sudo
export OS_SUDO_TESTING=1
cd $BASE/new/neutron cd $BASE/new/neutron
# Run tests as the stack user to allow sudo. # Run tests as the stack user to allow sudo+rootwrap.
sudo chown -R stack:stack $BASE/new/neutron sudo chown -R stack:stack $BASE/new/neutron
echo 'Defaults:stack !requiretty' | sudo tee /etc/sudoers.d/00_no_tty
echo "Running neutron functional test suite" echo "Running neutron functional test suite"
sudo -H -u stack tox -e functional sudo -H -u stack tox -e dsvm-functional
}} }}
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