From 2708e19468822d7cd88c45f02766eaba6b23e72e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 24 Feb 2017 19:58:01 +0000 Subject: [PATCH] gate_hook: accept dsvm-scenario-[ovs|linuxbridge] venv name Also enable ovs firewall for all jobs that match 'ovs' in $VENV. This will be needed to switch dvr/ovs scenario job to the new firewall driver, that should fix test_trunk. Change-Id: I5a36fa3a44e9de4225a00c854a95ad7b5d8987f7 Needed-By: Ie3261f528ccedb5fc2b1597c84cf998e82ede2cd --- neutron/tests/contrib/gate_hook.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index b7226b7125f..c87a43c5662 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -87,7 +87,8 @@ case $VENV in cd $DEVSTACK_PATH && sudo -H -u $GATE_STACK_USER ./stack.sh ;; -"api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario") +# TODO(ihrachys): remove dsvm-scenario from the list when it's no longer used in project-config +"api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge") load_rc_hook api_${FLAVOR}_extensions load_conf_hook quotas load_rc_hook dns @@ -102,7 +103,7 @@ case $VENV in if [[ "$VENV" =~ "pecan" ]]; then load_conf_hook pecan fi - if [[ "$VENV" =~ "ovsfw" ]]; then + if [[ "$VENV" =~ "ovs" ]]; then load_conf_hook ovsfw fi