Merge "Run with cells v2 in placement and neutron grenade jobs"

This commit is contained in:
Jenkins 2016-09-02 02:25:20 +00:00 committed by Gerrit Code Review
commit f373a316b2
2 changed files with 4 additions and 0 deletions

@ -907,6 +907,8 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_NEUTRON=1
# NOTE(mriedem): cells v2 should be the default after newton-eol
export DEVSTACK_LOCAL_CONFIG="NOVA_CONFIGURE_CELLSV2=True"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

@ -69,6 +69,8 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
# NOTE(mriedem): cells v2 should be the default after newton-eol
export DEVSTACK_LOCAL_CONFIG="NOVA_CONFIGURE_CELLSV2=True"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE