Skip to content

Commit

Permalink
Skip devstack/exercises by default
Browse files Browse the repository at this point in the history
In order to avoid maintaining test cases in two location,
the devstack/exercises should be disabled when tempest is enabled.

The exercises is preserved for grande and stable branch jobs.

A smaller/faster 'smoke' test case set can be selected from the tempest
test cases if it is needed.

Fixing bug #1023131

Change-Id: Icac3998fb2c18274d909afcff8708af149d68197
  • Loading branch information
afazekas committed Aug 17, 2013
1 parent 339b3da commit f70b9d6
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions devstack-vm-gate-wrap.sh
Expand Up @@ -370,8 +370,8 @@ fi
# Set to 1 to run the Tempest test suite
export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}

# Set to 0 to skip the devstack exercises
export DEVSTACK_GATE_EXERCISES=${DEVSTACK_GATE_EXERCISES:-1}
# Set to 1 to run the devstack exercises
export DEVSTACK_GATE_EXERCISES=${DEVSTACK_GATE_EXERCISES:-0}

# Set to 1 to run postgresql instead of mysql
export DEVSTACK_GATE_POSTGRES=${DEVSTACK_GATE_POSTGRES:-0}
Expand Down Expand Up @@ -403,6 +403,7 @@ export DEVSTACK_GATE_CELLS=${DEVSTACK_GATE_CELLS:-0}
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0}

if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
export DEVSTACK_GATE_EXERCISES=1
if [ "$ZUUL_BRANCH" == "stable/grizzly" ]; then
# Set to 1 to run cinder instead of nova volume
# Only applicable to stable/folsom branch
Expand All @@ -412,15 +413,17 @@ if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
export GRENADE_OLD_BRANCH="stable/grizzly"
export DEVSTACK_GATE_CINDER=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_EXERCISES=1
else # master
export GRENADE_OLD_BRANCH="stable/grizzly"
export DEVSTACK_GATE_CINDER=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_EXERCISES=1
fi
fi

if [ "$ZUUL_BRANCH" == "stable/grizzly" -o "$ZUUL_BRANCH" == "stable/folsom"]; then
export DEVSTACK_GATE_EXERCISES=1
fi

# Set the virtualization driver to: libvirt, openvz
export DEVSTACK_GATE_VIRT_DRIVER=${DEVSTACK_GATE_VIRT_DRIVER:-libvirt}

Expand Down

0 comments on commit f70b9d6

Please sign in to comment.