From 5d1bca4da5ba007ff028f5f6946f0cf5e129d9fa Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Wed, 27 Aug 2014 17:33:29 +0200 Subject: [PATCH] Fix func job hook script permission problems - The hook script is the wrong place to unstack since it needs to run as the stack user with sudo privileges and those permissions are removed as part of the devstack-vm-gate.sh script. - The functional job gate hook script needs to use sudo to install the test-only rootwrap filter. Change-Id: Ib2e5ec016a5a414dd9675328650efb2b39b0e3fe Related-Bug: #1360658 --- neutron/tests/functional/contrib/gate_hook.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/neutron/tests/functional/contrib/gate_hook.sh b/neutron/tests/functional/contrib/gate_hook.sh index 5251bd9392..9b04233ac2 100644 --- a/neutron/tests/functional/contrib/gate_hook.sh +++ b/neutron/tests/functional/contrib/gate_hook.sh @@ -4,14 +4,9 @@ set -ex $BASE/new/devstack-gate/devstack-vm-gate.sh -# Ideally devstack would only install dependencies -# rather than starting services, but for now unstack is -# a cheap way of accomplishing the same result. -$BASE/new/devstack/unstack.sh - # Add a rootwrap filter to support test-only # configuration (e.g. a KillFilter for processes that # use the python installed in a tox env). FUNC_FILTER=$BASE/new/neutron/neutron/tests/functional/contrib/filters.template sed -e "s+\$BASE_PATH+$BASE/new/neutron/.tox/dsvm-functional+" \ - $FUNC_FILTER > /etc/neutron/rootwrap.d/functional.filters + $FUNC_FILTER | sudo tee /etc/neutron/rootwrap.d/functional.filters > /dev/null