diff --git a/tox.ini b/tox.ini index 13b92fec..ac6a6427 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.5.0 -envlist = py27,py37,pep8,eslint,karma +envlist = py27,py37,py3-{dj111,dj22},pep8,eslint,karma skipsdist = True [testenv] @@ -15,7 +15,10 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/ -r{toxinidir}/test-requirements.txt whitelist_externals = npm bash -commands = python manage.py test octavia_dashboard --settings=octavia_dashboard.tests.settings +commands = + dj111: pip install django>=1.11,<2 + dj22: pip install django>=2.2,<2.3 + python manage.py test octavia_dashboard --settings=octavia_dashboard.tests.settings [testenv:pep8] basepython = python3 diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 65ed8710..23df061f 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -1,6 +1,7 @@ - project: templates: - check-requirements + - horizon-non-primary-django-jobs - horizon-nodejs10-jobs - openstack-lower-constraints-jobs - openstack-python-jobs-horizon