Use new d-g GRENADE flags in jenkins jobs.

Devstack gate is growing a new way of setting up Grenade jobs in
I4f102e27b422a5260cd0d5e40e00a5addf87911a. That change is mostly
backward compatible, but we should switch to the new way of doing
things. Do that in this change.

Essentially instead of setting many boolean flags set a single flag with
specific values to get what we want.

Change-Id: Idcfcc80c3bc222e5d540f792bdecb2b297afcd49
This commit is contained in:
Clark Boylan 2014-08-04 16:06:41 -07:00
parent 1d854cf598
commit 127ad834d7

View File

@ -1011,7 +1011,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_GRENADE=1
export DEVSTACK_GATE_GRENADE=pullup
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -1042,8 +1042,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_GRENADE=1
export DEVSTACK_GATE_GRENADE_FORWARD=1
export DEVSTACK_GATE_GRENADE=forward
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -1074,7 +1073,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_GRENADE=1
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -1106,9 +1105,8 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_GRENADE=1
export DEVSTACK_GATE_GRENADE=forward
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_GRENADE_FORWARD=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -1139,8 +1137,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_GRENADE=1
export DEVSTACK_GATE_GRENADE_PARTIAL_NCPU=1
export DEVSTACK_GATE_GRENADE=partial-ncpu
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE