Merge "Reduce number of services running in large-ops"

This commit is contained in:
Jenkins
2015-01-13 07:19:57 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 3 deletions

View File

@@ -855,6 +855,8 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NO_SERVICES=1
export ENABLED_SERVICES=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -916,6 +918,8 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NO_SERVICES=1
export ENABLED_SERVICES=n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key
export DEVSTACK_GATE_TEMPEST_LARGE_OPS=100
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}