From c7cffdaca3478510f5c82b1f9903a771168cdaca Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Sat, 17 Jan 2015 00:49:35 -0800 Subject: [PATCH] Add variable to allow Tempest to disable the test execution This will allow Tempest to install and configure only. This is particularly useful for some jobs, like the neutron-api. Change-Id: I778dbae3a52a53f0b714148a0a3e0816dba05656 --- devstack-vm-gate-wrap.sh | 7 ++++++- devstack-vm-gate.sh | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index a6a584f1..302f7fd9 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -143,9 +143,14 @@ mkdir -p $WORKSPACE/logs # The feature matrix to select devstack-gate components export DEVSTACK_GATE_FEATURE_MATRIX=${DEVSTACK_GATE_FEATURE_MATRIX:-features.yaml} -# Set to 1 to run the Tempest test suite +# Set to 1 to install, configure and enable the Tempest test suite; more flags may be +# required to be set to customize the test run, e.g. DEVSTACK_GATE_TEMPEST_STRESS=1 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0} +# Set to 1, in conjunction with DEVSTACK_GATE_TEMPEST, will allow Tempest to be +# installed and configured, but the tests will be skipped +export DEVSTACK_GATE_TEMPEST_NOTESTS=${DEVSTACK_GATE_TEMPEST_NOTESTS:-0} + # Set to 1 to run the devstack exercises export DEVSTACK_GATE_EXERCISES=${DEVSTACK_GATE_EXERCISES:-0} diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index ea372827..541cdb9a 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -518,6 +518,11 @@ if [[ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]]; then sudo chmod -R o+rx /opt/stack/new/devstack/files fi + # if set, we don't need to run Tempest at all + if [[ "$DEVSTACK_GATE_TEMPEST_NOTESTS" -eq "1" ]]; then + exit 0 + fi + # From here until the end we rely on the fact that all the code fails if # something is wrong, to enforce exit on bad test results. set -o errexit