Merge "Use Horizon project template for django jobs"

.zuul.yaml

@@ -1,14 +1,9 @@
 - project:
     templates:
       - check-requirements
+      - horizon-non-primary-django-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
-    check:
-      jobs:
-        - horizon-openstack-tox-python3-django111
-    gate:
-      jobs:
-        - horizon-openstack-tox-python3-django111

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py36,py27,pep8
+envlist = py37,py36,py27,py3-{dj111,dj22},pep8
 minversion = 2.0
 skipsdist = True
 
@@ -10,7 +10,10 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-commands = python manage.py test {posargs} --settings=congress_dashboard.test.settings
+commands =
+  dj111: pip install django>=1.11,<2
+  dj22: pip install django>=2.2,<2.3
+  python manage.py test {posargs} --settings=congress_dashboard.test.settings
 
 [testenv:pep8]
 basepython = python3
@@ -89,9 +92,3 @@ deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-
-[testenv:py3-dj111]
-basepython = python3
-commands =
-  pip install django>=1.11,<2
-  {[testenv]commands}