neutron-fwaas-dsvm-tempest: Use devstack plugin on master

Also, enable q-fwaas explicitly as it's going to be dropped in
devstack-gate.

Note: this job is excluded from stable/liberty.

Related-Change: Ic60cd1fa90c19dfac00be583e2ddc5633dbb68a3
Related-Change: Iadcee07e873fcb4f099ebccc2e33780e74438140
Change-Id: I23e39abada43b1ea3c7e95b082c04945305089a9
This commit is contained in:
YAMAMOTO Takashi 2016-06-29 18:32:07 +09:00
parent 02456d0d9e
commit 7b022fd20b
1 changed files with 7 additions and 0 deletions

View File

@ -68,6 +68,13 @@
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ "$ZUUL_BRANCH" != "stable/mitaka" ]]; then
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas"
fi
export ENABLE_SERVICES="q-fwaas"
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh