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
This commit is contained in:
Ihar Hrachyshka 2017-02-24 19:58:01 +00:00
parent da507c616d
commit 2708e19468
1 changed files with 3 additions and 2 deletions

View File

@ -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