diff --git a/extra-requirements.txt b/extra-requirements.txt new file mode 100644 index 000000000..cdcc8a928 --- /dev/null +++ b/extra-requirements.txt @@ -0,0 +1 @@ +validations-libs>=1.0 diff --git a/tox.ini b/tox.ini index 8c02ae4e8..1fe11309a 100644 --- a/tox.ini +++ b/tox.ini @@ -10,9 +10,10 @@ minversion = 3.8.0 usedevelop = True deps = - -c{env:TOX_CONSTRAINTS_FILE} + {env:TOX_CONSTRAINTS} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + {env:TOX_EXTRA_REQUIREMENTS} passenv = JENKINS_* PS1 @@ -30,7 +31,9 @@ setenv = TOBIKO_PREVENT_CREATE = {env:TOBIKO_PREVENT_CREATE:false} TOX_REPORT_NAME = {env:TOX_REPORT_NAME:test_results} TOX_REPORT_DIR = {env:TOX_REPORT_DIR:{toxinidir}/report/{envname}} + TOX_CONSTRAINTS = {env:TOX_CONSTRAINTS:-c{env:TOX_CONSTRAINTS_FILE}} TOX_CONSTRAINTS_FILE = {env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + TOX_EXTRA_REQUIREMENTS = {env:TOX_EXTRA_REQUIREMENTS:-r{toxinidir}/extra-requirements.txt} VIRTUAL_ENV = {envdir} commands = {envpython} {toxinidir}/tools/run_tests.py {env:RUN_TESTS_EXTRA_ARGS} {posargs} diff --git a/zuul.d/devstack.yaml b/zuul.d/devstack.yaml index 4ce26ad90..283f70bcd 100644 --- a/zuul.d/devstack.yaml +++ b/zuul.d/devstack.yaml @@ -13,6 +13,7 @@ - openstack/heat - openstack/neutron - openstack/requirements + - openstack/validations-libs - x/tobiko timeout: 7200 vars: