openstack/devstack-gate
Code Issues Proposed changes

Add support for running tempest serially without tenant isolation

Browse Source 
This commit adds a new env variable for devstack-gate:

DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION

which is used to disable tenant isolation. If this option is set
it will also run tempest serially instead of in parallel. This
depends on tempest commit: I886b3fd416b2063df5daaca8d17ac6fbbdfe399e

Change-Id: Ida532021e1287efed09343e8e546d0605355e889
This commit is contained in:
Matthew Treinish
2014-02-10 09:38:47 -05:00
parent 0d9f4f37d6
commit a5256d2931
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,9 +130,9 @@ export DEVSTACK_GATE_TEMPEST_LARGE_OPS=${DEVSTACK_GATE_TEMPEST_LARGE_OPS:-0}
# Set to 1 to run tempest smoke tests serially
export DEVSTACK_GATE_SMOKE_SERIAL=${DEVSTACK_GATE_SMOKE_SERIAL:-0}
# Set to 1 to explicitly enable tempest tenant isolation. Otherwise tenant isolation setting
# Set to 1 to explicitly disable tempest tenant isolation. Otherwise tenant isolation setting
# for tempest will be the one chosen by devstack.
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=${DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION:-0}
export DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION=${DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION:-0}
# Set to 1 to enable Cinder secure delete.
# False by default to avoid dd problems on Precise.

8
devstack-vm-gate.sh
View File

@@ -199,8 +199,8 @@ EOF
echo "TEMPEST_HTTP_IMAGE=http://127.0.0.1/" >> localrc
fi
if [ "$DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION" -eq "1" ]; then
echo "TEMPEST_ALLOW_TENANT_ISOLATION=True" >>localrc
if [ "$DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION" -eq "1" ]; then
echo "TEMPEST_ALLOW_TENANT_ISOLATION=False" >>localrc
fi
if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
@@ -323,6 +323,10 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
echo "Running tempest all test suite"
sudo -H -u tempest tox -eall -- --concurrency=$TEMPEST_CONCURRENCY
res=$?
elif [[ "$DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION" -eq "1" ]]; then
echo "Running tempest full test suite serially"
sudo -H -u tempest tox -efull-serial
res=$?
elif [[ "$DEVSTACK_GATE_TEMPEST_FULL" -eq "1" ]]; then
echo "Running tempest full test suite"
sudo -H -u tempest tox -efull -- --concurrency=$TEMPEST_CONCURRENCY