From a5256d293121a862fe0f0a6a3404b2a6c4cb58f6 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 10 Feb 2014 09:38:47 -0500 Subject: [PATCH] Add support for running tempest serially without tenant isolation 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 --- devstack-vm-gate-wrap.sh | 4 ++-- devstack-vm-gate.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index c93f22a2..7c63d54f 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -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. diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index b84a022f..350e6b52 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -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