Merge "Fix and improve cross-project functional testing"

This commit is contained in:
Zuul 2020-07-15 22:35:02 +00:00 committed by Gerrit Code Review
commit 78a563f3ac
2 changed files with 7 additions and 5 deletions

View File

@ -11,6 +11,7 @@
- cinderlib-lvm-functional - cinderlib-lvm-functional
- cinderlib-ceph-functional - cinderlib-ceph-functional
- cinder-tempest-plugin-lvm-lio-barbican
gate: gate:
queue: integrated queue: integrated
jobs: jobs:
@ -20,6 +21,7 @@
- cinderlib-lvm-functional - cinderlib-lvm-functional
- cinderlib-ceph-functional - cinderlib-ceph-functional
- cinder-tempest-plugin-lvm-lio-barbican
post: post:
jobs: jobs:
- publish-openstack-python-branch-tarball - publish-openstack-python-branch-tarball

10
tox.ini
View File

@ -39,7 +39,6 @@ passenv = CL_FTEST_POOL_NAME
setenv = OS_TEST_PATH=./cinderlib/tests/functional setenv = OS_TEST_PATH=./cinderlib/tests/functional
CL_FTEST_CFG={env:CL_FTEST_CFG:{toxinidir}/cinderlib/tests/functional/lvm.yaml} CL_FTEST_CFG={env:CL_FTEST_CFG:{toxinidir}/cinderlib/tests/functional/lvm.yaml}
CL_FTEST_ROOT_HELPER={env:CL_FTEST_ROOT_HELPER:{toxinidir}/tools/virtualenv-sudo.sh} CL_FTEST_ROOT_HELPER={env:CL_FTEST_ROOT_HELPER:{toxinidir}/tools/virtualenv-sudo.sh}
ADD_PATHS=/usr/local/sbin:/usr/sbin
sitepackages = True sitepackages = True
# Not reusing py37's env due to https://github.com/tox-dev/tox/issues/477 # Not reusing py37's env due to https://github.com/tox-dev/tox/issues/477
@ -48,12 +47,13 @@ sitepackages = True
# Must run serially or test_stats_with_creation may fail occasionally # Must run serially or test_stats_with_creation may fail occasionally
commands = commands =
find . -ignore_readdir_race -type f -name "*.pyc" -delete find . -ignore_readdir_race -type f -name "*.pyc" -delete
# Tox has a bug and it ignores the PATH set in setenv, so we work around it # run stestr through python -m so that the python from the virtualenv
bash -i -c "PATH=$PATH:$ADD_PATHS stestr run --serial {posargs}" # is used; stestr's shebang may point to system python, thus breaking
stestr slowest # the lookup of modules from the venv.
python -m stestr run --serial {posargs}
python -m stestr slowest
whitelist_externals = whitelist_externals =
bash
find find
stestr stestr