diff options
| -rw-r--r-- | .zuul.yaml | 48 | ||||
| -rw-r--r-- | tox.ini | 13 |
2 files changed, 53 insertions, 8 deletions
@@ -1,3 +1,37 @@ +- job: + name: swiftclient-swift-functional + parent: swift-dsvm-functional + description: | + Run swift's functional tests with python-swiftclient + installed from source instead as package from PyPI. + # Ensure that we install python-swiftclient from git and + # do not install from pypi. This is needed since the parent + # job sets zuul_work_dir to the swift directory and uses tox + # for installation. + required-projects: + - git.openstack.org/openstack/python-swiftclient + +- job: + name: swiftclient-functional + parent: swift-dsvm-functional + description: | + Run functional tests of python-swiftclient with + python-swiftclient installed from source instead as package from + PyPI. + required-projects: + - git.openstack.org/openstack/python-swiftclient + vars: + # Override value from parent job to use swiftclient tests + zuul_work_dir: "{{ zuul.projects['git.openstack.org/openstack/python-swiftclient'].src_dir }}" + +- job: + name: swiftclient-functional-py2 + parent: swiftclient-functional + description: | + Run functional tests of python-swiftclient under Python 2 + vars: + tox_envlist: py2func + - project: templates: - openstack-python-jobs @@ -10,18 +44,16 @@ - release-notes-jobs-python3 check: jobs: + - swiftclient-swift-functional + - swiftclient-functional + - swiftclient-functional-py2 - openstack-tox-lower-constraints - - legacy-swift-dsvm-functional - - legacy-swift-dsvm-functional-identity-v3-only: - voting: false - - legacy-swiftclient-dsvm-functional - - legacy-swiftclient-dsvm-functional-identity-v3-only: - voting: false gate: jobs: + - swiftclient-swift-functional + - swiftclient-functional + - swiftclient-functional-py2 - openstack-tox-lower-constraints - - legacy-swift-dsvm-functional - - legacy-swiftclient-dsvm-functional post: jobs: - openstack-tox-cover @@ -22,17 +22,21 @@ whitelist_externals = sh passenv = SWIFT_* *_proxy [testenv:pep8] +basepython = python3 commands = python -m flake8 swiftclient tests [testenv:venv] +basepython = python3 commands = {posargs} [testenv:cover] +basepython = python3 commands = python setup.py testr --coverage coverage report [testenv:func] +basepython = python3 setenv = OS_TEST_PATH=tests.functional whitelist_externals = coverage @@ -42,7 +46,14 @@ commands = coverage report -m rm -f .coverage +[testenv:py2func] +basepython=python2 +setenv = {[testenv:func]setenv} +whitelist_externals = {[testenv:func]whitelist_externals} +commands = {[testenv:func]commands} + [testenv:docs] +basepython = python3 commands= python setup.py build_sphinx @@ -60,6 +71,7 @@ show-source = True exclude = .venv,.tox,dist,doc,*egg [testenv:bindep] +basepython = python3 # Do not install any requirements. We want this to be fast and work even if # system dependencies are missing, since it's used to tell you what system # dependencies are missing! This also means that bindep must be installed @@ -69,6 +81,7 @@ deps = bindep commands = bindep test [testenv:releasenotes] +basepython = python3 commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] |