From 21abe4ba34faee99551dbf27134e0482d67876a3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 6 Oct 2015 14:48:37 -0700 Subject: [PATCH] Let devstack-gate handle the gate hook timeout Devstack gate now handles all of the hook timeouts itself so that individual jobs do not need to reinvent this wheel. Remove the timeout support from the functional test gate hook here as a result. Change-Id: I3819978b04faea5712c995cbe277ae42870acba9 --- neutronclient/tests/functional/hooks/gate_hook.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/neutronclient/tests/functional/hooks/gate_hook.sh b/neutronclient/tests/functional/hooks/gate_hook.sh index 9f1d8eb5b..b44c237f1 100644 --- a/neutronclient/tests/functional/hooks/gate_hook.sh +++ b/neutronclient/tests/functional/hooks/gate_hook.sh @@ -1,18 +1,12 @@ #!/usr/bin/env bash - set -ex -source $BASE/new/devstack-gate/functions.sh -start_timer - VENV=${1:-"functional"} - if [ "$VENV" == "functional-adv-svcs" ] then export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas" fi -remaining_time -timeout -s 9 ${REMAINING_TIME}m $BASE/new/devstack-gate/devstack-vm-gate.sh +$BASE/new/devstack-gate/devstack-vm-gate.sh