Merge "the src-neutron-icehouse jobs should only run smoke tests"

This commit is contained in:
Jenkins 2014-12-01 14:12:12 +00:00 committed by Gerrit Code Review
commit 70acbde923

View File

@ -191,8 +191,12 @@
export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
# neutron icehouse does not pass tempest full reliably
if [ "$BRANCH_OVERRIDE" != "stable/icehouse"] ; then
export DEVSTACK_GATE_TEMPEST_FULL=1
fi
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi