From 7a7cea07999c733dd1522f43bc6ebc77a314c67b Mon Sep 17 00:00:00 2001
From: manchandavishal <manchandavishal143@gmail.com>
Date: Wed, 9 Oct 2019 16:09:43 +0000
Subject: [PATCH] Use Horizon project template for django jobs

Horizon defined a project template 'horizon-non-primary-django-jobs'
for django jobs. This patch use that template to run django jobs
here. For information please refer [1]

[1] https://review.opendev.org/#/c/681969/

Change-Id: If66f8edc7208b406d39cce90d22be53dd7e21301
---
 .zuul.yaml |  1 +
 tox.ini    | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 05f00f5..fa1593b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,6 @@
 - project:
     templates:
+      - horizon-non-primary-django-jobs
       - openstack-python-jobs
       - openstack-python3-train-jobs
       - check-requirements
diff --git a/tox.ini b/tox.ini
index e635908..a879ca4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py37,py27dj18,pep8
+envlist = py27,py37,py3-{dj111,dj22},pep8
 minversion = 1.6
 skipsdist = True
 
@@ -12,7 +12,10 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = {toxinidir}/manage.py test karbor_dashboard --settings=karbor_dashboard.test.settings
+commands =
+   dj111: pip install django>=1.11,<2
+   dj22: pip install django>=2.2,<2.3
+   {toxinidir}/manage.py test karbor_dashboard --settings=karbor_dashboard.test.settings
 
 [testenv:pep8]
 basepython = python3
@@ -28,11 +31,6 @@ commands = {posargs}
 basepython = python3
 commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs}
 
-[testenv:py27dj18]
-basepython = python2.7
-commands = pip install django>=1.8,<1.9
-           /bin/bash run_tests.sh -N --no-pep8 {posargs}
-
 [testenv:py27integration]
 basepython = python2.7
 commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}