Make neutron-fwaas multinode jobs work
These changes are to make the neutron-fwaas multinode jobs work. I also backport fixes to the grenade job. Change-Id: Id2f5dddb316bb0304ffe7e32dc9f228735088482
This commit is contained in:
parent
6aabaff717
commit
c2b4d39dfd
|
@ -114,7 +114,8 @@
|
||||||
- shell: |
|
- shell: |
|
||||||
#!/bin/bash -xe
|
#!/bin/bash -xe
|
||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
export ENABLED_SERVICES="q-fwaas-v1"
|
export FWAAS_VERSION="v1"
|
||||||
|
export ENABLED_SERVICES="q-fwaas-$FWAAS_VERSION"
|
||||||
export DEVSTACK_GATE_NEUTRON=1
|
export DEVSTACK_GATE_NEUTRON=1
|
||||||
export DEVSTACK_GATE_CONFIGDRIVE=0
|
export DEVSTACK_GATE_CONFIGDRIVE=0
|
||||||
export DEVSTACK_GATE_GRENADE=pullup
|
export DEVSTACK_GATE_GRENADE=pullup
|
||||||
|
@ -123,9 +124,16 @@
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||||
fi
|
fi
|
||||||
|
function gate_hook {{
|
||||||
|
bash -xe $BASE/new/neutron-fwaas/neutron_fwaas/tests/contrib/gate_hook_tempest.sh $FWAAS_VERSION
|
||||||
|
}}
|
||||||
export DEVSTACK_GATE_TOPOLOGY="multinode"
|
export DEVSTACK_GATE_TOPOLOGY="multinode"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas"
|
||||||
|
|
||||||
|
if [[ ! "stable/liberty stable/mitaka stable/newton" =~ $ZUUL_BRANCH ]]; then
|
||||||
|
export -f gate_hook
|
||||||
|
fi
|
||||||
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
./safe-devstack-vm-gate-wrap.sh
|
||||||
|
|
||||||
|
@ -158,6 +166,9 @@
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||||
fi
|
fi
|
||||||
|
function gate_hook {{
|
||||||
|
bash -xe $BASE/new/neutron-fwaas/neutron_fwaas/tests/contrib/gate_hook_tempest.sh {fwaas-version}
|
||||||
|
}}
|
||||||
if [ "$FWAAS_VERSION" = "v2" ] ; then
|
if [ "$FWAAS_VERSION" = "v2" ] ; then
|
||||||
export ENABLED_SERVICES="q-fwaas-v2"
|
export ENABLED_SERVICES="q-fwaas-v2"
|
||||||
elif [ "$FWAAS_VERSION" = "v1" ] ; then
|
elif [ "$FWAAS_VERSION" = "v1" ] ; then
|
||||||
|
@ -165,6 +176,10 @@
|
||||||
fi
|
fi
|
||||||
export DEVSTACK_GATE_TOPOLOGY="multinode"
|
export DEVSTACK_GATE_TOPOLOGY="multinode"
|
||||||
|
|
||||||
|
if [[ ! "stable/liberty stable/mitaka stable/newton" =~ $ZUUL_BRANCH ]]; then
|
||||||
|
export -f gate_hook
|
||||||
|
fi
|
||||||
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
./safe-devstack-vm-gate-wrap.sh
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue