diff options
| author | Jeremy Stanley <fungi@yuggoth.org> | 2022-08-05 21:00:02 +0000 |
|---|---|---|
| committer | Jeremy Stanley <fungi@yuggoth.org> | 2022-08-05 21:00:02 +0000 |
| commit | 90d7dcb1ed66f9685b74cd68383c21c2203d4037 (patch) | |
| tree | 77895c73931edb5099a5fef592f6cc5cf11a287c /tox.ini | |
| parent | 68684d519e9f906afd899a37f9e3da92b61f914d (diff) | |
| download | zuul-90d7dcb1ed66f9685b74cd68383c21c2203d4037.tar.gz | |
Update unit test container setup and instructions
Update the TESTING.rst file to reflect that just installing and
starting zookeeperd is no longer sufficient now that we require TLS
and auth for the connection, as well as running database servers.
Suggest the container-based setup script instead. Also improve that
script to allow it to be invoked as a normal user, with root command
escalation tool choice (e.g. "sudo") supplied through a ROOTCMD
environment variable, so that things created inside the git worktree
like the CA don't end up root-owned.
Related, the tox-docker plugin previously suggested in the document
is no longer a viable option for the same reasons, so clean up the
plumbing for it in tox.ini as well.
Change-Id: Iac32799425a5bd4b1bdbf56f34a2310241ac4499
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -1,11 +1,8 @@ [tox] minversion = 3.2 skipsdist = True -envlist = linters,py3{-docker} +envlist = linters,py3 ignore_basepython_conflict = True -# TODO(stephenfin): It would be good to set 'requires = tox-docker', but doing -# so borks the tools/pip.sh wrapper we're using here and probably isn't what -# we want in the gate :( [testenv] basepython = python3 @@ -19,7 +16,6 @@ setenv = SQLALCHEMY_WARN_20={env:SQLALCHEMY_WARN_20:1} PYTHONWARNINGS=always::DeprecationWarning:zuul.driver.sql.sqlconnection,always::DeprecationWarning:tests.base,always::DeprecationWarning:tests.unit.test_database,always::DeprecationWarning:zuul.driver.sql.alembic.env,always::DeprecationWarning:zuul.driver.sql.alembic.script passenv = - DOCKER_* NODEPOOL_ZK_HOST OS_LOG_CAPTURE OS_LOG_DEFAULTS @@ -40,8 +36,6 @@ whitelist_externals = bash deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -docker = - docker: zookeeper:3.4 commands = bash -c 'stestr run --slowest --concurrency=`python -c "import multiprocessing; print(max(int(multiprocessing.cpu_count()-1),1))"` {posargs}' @@ -96,7 +90,6 @@ deps = [testenv:remote] passenv = - DOCKER_* NODEPOOL_ZK_HOST OS_LOG_CAPTURE OS_LOG_DEFAULTS |