Fix gerritbot CI

This is fallout from the v4 and default nodeset updates.

Change-Id: I11b1c979767aeda64c9436e407b4627cc0d0b16f
This commit is contained in:
Clark Boylan 2023-05-05 15:20:16 -07:00
parent ec934f441c
commit 00ec88ed8e
2 changed files with 12 additions and 7 deletions

View File

@ -62,14 +62,16 @@
check: check:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38 - tox-py38:
nodeset: ubuntu-focal
- tox-py310: - tox-py310:
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
- gerritbot-build-opendev-image - gerritbot-build-opendev-image
gate: gate:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38 - tox-py38:
nodeset: ubuntu-focal
- tox-py310: - tox-py310:
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
- gerritbot-upload-opendev-image - gerritbot-upload-opendev-image

13
tox.ini
View File

@ -1,10 +1,9 @@
[tox] [tox]
envlist = py38,pep8 envlist = py310,py38,pep8
[testenv] [testenv]
usedevelop = True usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
basepython = python3
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONDONTWRITEBYTECODE = 1 PYTHONDONTWRITEBYTECODE = 1
LANGUAGE=en_US LANGUAGE=en_US
@ -12,12 +11,16 @@ setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning
TESTS_DIR=./gerritbot/tests/unit/ TESTS_DIR=./gerritbot/tests/unit/
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = rm allowlist_externals = rm
commands = commands =
rm -f .testrepository/times.dbm rm -f .testrepository/times.dbm
stestr run {posargs} stestr run {posargs}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY passenv = http_proxy
HTTP_PROXY
https_proxy
HTTPS_PROXY
no_proxy
NO_PROXY
[testenv:pep8] [testenv:pep8]
commands = flake8 commands = flake8