diff options
| author | Zane Bitter <zbitter@redhat.com> | 2018-04-06 10:24:07 -0400 |
|---|---|---|
| committer | Zane Bitter <zbitter@redhat.com> | 2018-04-06 10:30:56 -0400 |
| commit | b9a2f48823caee4aa940490ddd6572ea58703c7e (patch) | |
| tree | 27e5d3c8cb08b66a90fcbbb81439ae32b3ecb35f | |
| parent | a2e26ffb71995c78fda9a91e01558600ea063274 (diff) | |
| download | heat-b9a2f48823caee4aa940490ddd6572ea58703c7e.tar.gz | |
Add .testr.conf to work with latest Tempest
The .testr.conf file has been removed from the tempest tree, because the
tempest command has been switched to stestr in the latest version (and
tempest is branchless, so devstack clones the latest version). However the
Ocata test environment actually has an old version of tempest installed
that uses testr. Create a .testr.conf file so that we can run tempest.
This change is adapted from f77fab1c09a8fddef983980bf6553090b0f047f0 in
the Pike branch, which encountered the same issue in its grenade tests
(since grenade starts by installing the previous version).
Change-Id: I0328e3c7229f893f78fa8c3590c5160093f1bc18
| -rwxr-xr-x | heat_integrationtests/post_test_hook.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/heat_integrationtests/post_test_hook.sh b/heat_integrationtests/post_test_hook.sh index b12f1887f..ddc51c755 100755 --- a/heat_integrationtests/post_test_hook.sh +++ b/heat_integrationtests/post_test_hook.sh @@ -21,6 +21,22 @@ sudo -E $DEST/heat/heat_integrationtests/prepare_test_env.sh sudo -E $DEST/heat/heat_integrationtests/prepare_test_network.sh cd $DEST/tempest + +# Old version of tempest is installed in the test environment, so use +# .testr.conf instead of .stestr.conf +cat <<'EOF' >.testr.conf +[DEFAULT] +test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ + OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ + OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \ + OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \ + ${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} \ + ${OS_TEST_PATH:-./tempest/test_discover} $LISTOPT $IDOPTION +test_id_option=--load-list $IDFILE +test_list_option=--list +group_regex=heat_integrationtests\.api\.test_heat_api(?:\.|_)([^_]+) +EOF + sudo tempest run --regex heat_integrationtests sudo -E $DEST/heat/heat_integrationtests/cleanup_test_env.sh |