Merge "networking-odl: adopt DEVSTACK_GATE_SETTINGS"
This commit is contained in:
commit
30808ba77f
@ -55,6 +55,7 @@
|
||||
}}
|
||||
export -f post_test_hook
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/devstack/devstackgaterc
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
@ -90,8 +91,6 @@
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
|
||||
export OVERRIDE_ENABLED_SERVICES=q-svc,q-dhcp,q-meta,quantum,n-api,n-cond,n-cpu,n-crt,n-sch,g-api,g-reg,mysql,rabbit,key,dstat
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
@ -108,6 +107,7 @@
|
||||
}}
|
||||
export -f post_test_hook
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/devstack/devstackgaterc
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
@ -145,6 +145,7 @@
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/devstack/devstackgaterc
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
@ -211,9 +212,10 @@
|
||||
|
||||
export DEVSTACK_GATE_TOPOLOGY="multinode"
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/devstack/devstackgaterc
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
||||
publishers:
|
||||
- devstack-logs
|
||||
- console-log
|
||||
- console-log
|
||||
|
Loading…
Reference in New Issue
Block a user