zuul: move jobs in-tree and related updates

Move the job definitions in-tree, updating them when needed.
This lead to several changes:

- update tox.ini and setup.cfg to align it to the newest standards
  (including newer python classifiers);
- no more python 2.x jobs;
- bump hacking requirements to make the pep8 job work with the newest
  python releases;
- ignore a few spurious flake8 warnings;
- switch to stestr as test runner;
- update cryptography dependency.

The old barbican simple-crypto job name is still available as an alias
for a while, but it is time to switch away from it, so directly
use the new job.

Depends-On: https://review.opendev.org/771443
Change-Id: Iba7b4106c49e4b492c97097648c7b8f599a2ca4b
This commit is contained in:
Luigi Toscano 2021-01-19 15:25:08 +01:00
parent f8e9d5870f
commit 450f696589
8 changed files with 52 additions and 21 deletions

3
.stestr.conf Normal file
View File

@ -0,0 +1,3 @@
[DEFAULT]
test_path=${OS_TEST_PATH:-./cursive/tests/unit}
top_dir=./

View File

@ -1,7 +1,10 @@
- project: - project:
templates:
- openstack-python3-wallaby-jobs
- check-requirements
check: check:
jobs: jobs:
- barbican-simple-crypto-devstack-tempest-cursive - barbican-tempest-plugin-simple-crypto-cursive
gate: gate:
jobs: jobs:
- barbican-simple-crypto-devstack-tempest-cursive - barbican-tempest-plugin-simple-crypto-cursive

View File

@ -334,7 +334,7 @@ def get_certificate(context, signature_certificate_uuid):
try: try:
# The certificate retrieved here is a castellan certificate object # The certificate retrieved here is a castellan certificate object
cert = keymgr_api.get(context, signature_certificate_uuid) cert = keymgr_api.get(context, signature_certificate_uuid)
except ManagedObjectNotFoundError as e: except ManagedObjectNotFoundError as e: # noqa: F841
raise exception.SignatureVerificationError( raise exception.SignatureVerificationError(
reason=_('Certificate not found with ID: %s') reason=_('Certificate not found with ID: %s')
% signature_certificate_uuid) % signature_certificate_uuid)

9
doc/requirements.txt Normal file
View File

@ -0,0 +1,9 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx>=1.6.2,!=1.6.6 # BSD
openstackdocstheme>=1.17.0 # Apache-2.0
# releasenotes
reno>=1.8.0 # Apache2

View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0 pbr>=1.6 # Apache-2.0
cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0 cryptography>=2.1 # BSD/Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.16.0 # Apache-2.0 oslo.utils>=3.16.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0

View File

@ -13,11 +13,11 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
[files] [files]
packages = packages =

View File

@ -2,17 +2,13 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking<0.12,>=0.11.0 # Apache-2.0 hacking>=3.1.0,<3.2.0 # Apache-2.0
stestr>=3.0.1 # Apache-2.0
coverage>=3.6 # Apache-2.0 coverage>=3.6 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD python-subunit>=0.0.18 # Apache-2.0/BSD
mock>=2.0.0 # BSD mock>=2.0.0 # BSD
sphinx>=1.6.2,!=1.6.6 # BSD
openstackdocstheme>=1.17.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
# releasenotes
reno>=1.8.0 # Apache2

34
tox.ini
View File

@ -1,15 +1,21 @@
[tox] [tox]
minversion = 2.0 minversion = 3.1.0
envlist = py34,py27,pep8 envlist = py38,py36,pep8
skipsdist = True skipsdist = True
# this allows tox to infer the base python from the environment name
# and override any basepython configured in this file
ignore_basepython_conflict=true
[testenv] [testenv]
basepython = python3
usedevelop = True usedevelop = True
install_command = pip install -U {opts} {packages} install_command = pip install -U {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}' commands =
stestr run {posargs}
stestr slowest
[testenv:pep8] [testenv:pep8]
commands = flake8 {posargs} commands = flake8 {posargs}
@ -18,12 +24,26 @@ commands = flake8 {posargs}
commands = {posargs} commands = {posargs}
[testenv:cover] [testenv:cover]
commands = python setup.py test --coverage --testr-args='{posargs}' setenv =
{[testenv]setenv}
PYTHON=coverage run --source cinder --parallel-mode
commands =
stestr run {posargs}
coverage combine
coverage html -d cover
coverage xml -o cover/coverage.xml
[testenv:docs] [testenv:docs]
commands = python setup.py build_sphinx deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -fr doc/build/html doc/build/doctrees
sphinx-build -W -j auto -b html -d doc/build/doctrees doc/source doc/build/html
whitelist_externals = rm
[testenv:releasenotes] [testenv:releasenotes]
deps = {[testenv:docs]deps}
commands = commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@ -33,6 +53,6 @@ commands = oslo_debug_helper {posargs}
[flake8] [flake8]
show-source = True show-source = True
ignore = H301 ignore = H301,W504
builtins = _ builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build