From 7d4433eef5242983e6369ca32d5e3b6fee492e4f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 7 Sep 2018 12:17:01 +0200 Subject: [PATCH] Use templates for cover and lower-constraints Use openstack-tox-cover template, this runs the cover job as non-voting in the check queue only. Use openstack-lower-constraints-jobs template Remove jobs that are part of the templates. Sort template list alphabetically. Fix cover tox.ini setting so that this works. Change-Id: I6e7d197b780e79f22ad936fe63da13ca48098764 --- .zuul.yaml | 21 +++++++-------------- tox.ini | 8 +++++++- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index a6f9c34..a97bdb4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,20 +1,13 @@ - project: - check: - jobs: - - openstack-tox-lower-constraints - gate: - jobs: - - openstack-tox-lower-constraints templates: - - openstack-python-jobs - - publish-openstack-docs-pti - check-requirements - - openstack-python35-jobs - lib-forward-testing - lib-forward-testing-python3 - - release-notes-jobs-python3 - - periodic-stable-jobs + - openstack-cover-jobs + - openstack-lower-constraints-jobs + - openstack-python-jobs + - openstack-python35-jobs - openstack-python36-jobs - post: - jobs: - - openstack-tox-cover + - periodic-stable-jobs + - publish-openstack-docs-pti + - release-notes-jobs-python3 diff --git a/tox.ini b/tox.ini index 7ac6bee..979e668 100644 --- a/tox.ini +++ b/tox.ini @@ -35,7 +35,13 @@ commands = python setup.py build_sphinx [testenv:cover] basepython = python3 -commands = python setup.py test --coverage --coverage-package-name=oslo_concurrency --testr-args='{posargs}' +setenv = + PYTHON=coverage run --source oslo_concurrency --parallel-mode +commands = + stestr run '{posargs}' + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [flake8] show-source = True