diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2015-10-06 14:48:37 -0700 |
|---|---|---|
| committer | Armando Migliaccio <armamig@gmail.com> | 2015-10-07 03:15:20 +0000 |
| commit | c5d04c9f5c3e52d32c338cfbce58056ab1c7f11a (patch) | |
| tree | 132ec1d781c6aa596a9cc0acaf059ba211a9ae00 | |
| parent | db7eb557403da7c0e1eca7e12f6ddab6bc0d1fc1 (diff) | |
| download | python-neutronclient-c5d04c9f5c3e52d32c338cfbce58056ab1c7f11a.tar.gz | |
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.
(cherry picked from commit 21abe4ba34faee99551dbf27134e0482d67876a3)
Conflicts:
neutronclient/tests/functional/hooks/gate_hook.sh
Depends-on: I8549db52fa5b752202ac7f019b3e1931a697e337
Change-Id: I3819978b04faea5712c995cbe277ae42870acba9
| -rw-r--r-- | neutronclient/tests/functional/hooks/gate_hook.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/neutronclient/tests/functional/hooks/gate_hook.sh b/neutronclient/tests/functional/hooks/gate_hook.sh index 4594c22..b9a02b0 100644 --- a/neutronclient/tests/functional/hooks/gate_hook.sh +++ b/neutronclient/tests/functional/hooks/gate_hook.sh @@ -1,16 +1,12 @@ #!/usr/bin/env bash - set -ex - VENV=${1:-"functional"} - if [ "$VENV" == "functional-vpn" ] 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 |