Configurable tests2skip file in tempest element

Make the file that contains the list of regex for test
selection configurable, so that it becomes possible to use
a custom inclusion/exclusion list.

Change-Id: Iddf8e2be8ac694ef4959228e34f5fe26b63b4d40
This commit is contained in:
Andrea Frittoli 2014-06-09 16:15:40 +01:00
parent d4e676ec63
commit 4948c0fa43
3 changed files with 14 additions and 1 deletions

View File

@ -14,6 +14,10 @@ Tempest configuration may be overwritten via pass-through.
tempest-run configuration is defined in etc/tempestrunrc; values in there
may be overwritten using ExtraConfig.
Tests may be skipped by modifying the existing tests2skip.txt file or
supplying a custom one (see tempestrunrc).
See tests2skip.py for more details on how to include and skip tests.
TODO:
* Remove as many of the filters in tests2skip.txt as possible
* Investigate setting run_ssh to true

View File

@ -22,6 +22,7 @@ function check_environment {
# Check the environment to fail nicely if something is missing
TEMPEST_RUN_CONCURRENCY=${TEMPEST_RUN_CONCURRENCY:?"TEMPEST_RUN_CONCURRENCY must be defined"}
TEMPEST_IMAGE_NAME=${TEMPEST_IMAGE_NAME:?"TEMPEST_IMAGE_NAME must be defined"}
TEMPEST_TEST_REGEX_FILE=${TEMPEST_TEST_REGEX_FILE:?"TEMPEST_TEST_REGEX_FILE must be defined"}
}
# Setup the environment. tempestrunrc file must exist, if not we fail
@ -99,4 +100,4 @@ set /files/opt/stack/tempest/etc/tempest.conf/network/public_network_id $EXTNET
save
EOF
testr run --parallel --concurrency ${TEMPEST_RUN_CONCURRENCY} $(python tests2skip.py tests2skip.txt)
testr run --parallel --concurrency ${TEMPEST_RUN_CONCURRENCY} $(python tests2skip.py ${TEMPEST_TEST_REGEX_FILE})

View File

@ -14,3 +14,11 @@ TEMPEST_IMAGE_NAME={{tempestrun.image}}
# Name of the test image to be used
TEMPEST_IMAGE_NAME=user
{{/tempestrun.image}}
{{#tempestrun.regexfile}}
# File including the regexs for test filtering
TEMPEST_TEST_REGEX_FILE={{tempestrun.regexfile}}
{{/tempestrun.regexfile}}
{{^tempestrun.regexfile}}
# File including the regexs for test filtering
TEMPEST_TEST_REGEX_FILE=tests2skip.txt
{{/tempestrun.regexfile}}