diff --git a/.zuul.yaml b/.zuul.yaml index ff42e6e7..1f899103 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -25,6 +25,7 @@ templates: - check-requirements - horizon-nodejs10-jobs + - horizon-non-primary-django-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - openstack-python3-train-jobs diff --git a/tox.ini b/tox.ini index 62bbbfc3..34cecc3e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.8 skipsdist = True -envlist = py3,py27,pep8 +envlist = py3,py27,py3-{dj111,dj22},pep8 [testenv] usedevelop = True @@ -15,7 +15,10 @@ setenv = VIRTUAL_ENV={envdir} DJANGO_SETTINGS_MODULE=ironic_ui.test.settings deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = {toxinidir}/manage.py test ironic_ui --settings=ironic_ui.test.settings --exclude-tag integration +commands = + dj111: pip install django>=1.11,<2 + dj22: pip install django>=2.2,<2.3 + {toxinidir}/manage.py test ironic_ui --settings=ironic_ui.test.settings --exclude-tag integration [testenv:integration] # Run integration tests only