openstack/devstack-gate
Code Issues Proposed changes

Merge "Allow concurrency to be tweaked for tempest"

Browse Source
This commit is contained in:
Jenkins
2014-01-12 05:22:34 +00:00
committed by Gerrit Code Review
parent b1ba3f3419 02b50320f8
commit e4e1917a04
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devstack-vm-gate-wrap.sh
View File

@@ -143,6 +143,9 @@ export DEVSTACK_GATE_SAVANNA=${DEVSTACK_GATE_SAVANNA:-0}
# Set to 0 to disable config_drive and use the metadata server instead # Set to 0 to disable config_drive and use the metadata server instead
export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1} export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1}
# Set the number of threads to run tempest with
export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-4}
# The following variables are set for different directions of Grenade updating # The following variables are set for different directions of Grenade updating
# for a stable branch we want to both try to upgrade forward n => n+1 as # for a stable branch we want to both try to upgrade forward n => n+1 as
# well as upgrade from last n-1 => n. # well as upgrade from last n-1 => n.

12
devstack-vm-gate.sh
View File

@@ -314,15 +314,15 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
cd $BASE/new/tempest cd $BASE/new/tempest
if [[ "$DEVSTACK_GATE_TEMPEST_ALL" -eq "1" ]]; then if [[ "$DEVSTACK_GATE_TEMPEST_ALL" -eq "1" ]]; then
echo "Running tempest all test suite" echo "Running tempest all test suite"
sudo -H -u tempest tox -eall sudo -H -u tempest tox -eall -- --concurrency=$TEMPEST_CONCURRENCY
res=$? res=$?
elif [[ "$DEVSTACK_GATE_TEMPEST_FULL" -eq "1" ]]; then elif [[ "$DEVSTACK_GATE_TEMPEST_FULL" -eq "1" ]]; then
echo "Running tempest full test suite" echo "Running tempest full test suite"
sudo -H -u tempest tox -efull sudo -H -u tempest tox -efull -- --concurrency=$TEMPEST_CONCURRENCY
res=$? res=$?
elif [[ "$DEVSTACK_GATE_TEMPEST_TESTR_FULL" -eq "1" ]]; then elif [[ "$DEVSTACK_GATE_TEMPEST_TESTR_FULL" -eq "1" ]]; then
echo "Running tempest full test suite with testr" echo "Running tempest full test suite with testr"
sudo -H -u tempest tox -etestr-full sudo -H -u tempest tox -etestr-full -- --concurrency=$TEMPEST_CONCURRENCY
res=$? res=$?
elif [[ "$DEVSTACK_GATE_TEMPEST_STRESS" -eq "1" ]] ; then elif [[ "$DEVSTACK_GATE_TEMPEST_STRESS" -eq "1" ]] ; then
echo "Running stress tests" echo "Running stress tests"
@@ -330,11 +330,11 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
res=$? res=$?
elif [[ "$DEVSTACK_GATE_TEMPEST_HEAT_SLOW" -eq "1" ]] ; then elif [[ "$DEVSTACK_GATE_TEMPEST_HEAT_SLOW" -eq "1" ]] ; then
echo "Running slow heat tests" echo "Running slow heat tests"
sudo -H -u tempest tox -eheat-slow sudo -H -u tempest tox -eheat-slow -- --concurrency=$TEMPEST_CONCURRENCY
res=$? res=$?
elif [[ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]] ; then elif [[ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]] ; then
echo "Running large ops tests" echo "Running large ops tests"
sudo -H -u tempest tox -elarge-ops sudo -H -u tempest tox -elarge-ops -- --concurrency=$TEMPEST_CONCURRENCY
res=$? res=$?
elif [[ "$DEVSTACK_GATE_SMOKE_SERIAL" -eq "1" ]] ; then elif [[ "$DEVSTACK_GATE_SMOKE_SERIAL" -eq "1" ]] ; then
echo "Running tempest smoke tests" echo "Running tempest smoke tests"
@@ -342,7 +342,7 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
res=$? res=$?
else else
echo "Running tempest smoke tests" echo "Running tempest smoke tests"
sudo -H -u tempest tox -esmoke sudo -H -u tempest tox -esmoke -- --concurrency=$TEMPEST_CONCURRENCY
res=$? res=$?
fi fi