openstack/zun-ui
Code Issues Proposed changes

Use Horizon project template for django jobs

Browse Source 
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: I73738b67af135df025e6faab572491fdf88e2e77
This commit is contained in:
manchandavishal 2019-10-05 09:55:21 +00:00 committed by Vishal Manchanda
parent d42c8fe536
commit 899a0d78a2
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.zuul.yaml
View File

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

20
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = pep8,py37,py27-local,py36-local,py3-dj111-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local envlist = pep8,py37,py27-local,py36-local,py3-{dj111,dj22},eslint,karma-local,docs-local,releasenotes,lower-constraints-local
minversion = 2.3.2 minversion = 2.3.2
skipsdist = True skipsdist = True
@ -17,7 +17,10 @@ deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = python manage.py test {posargs} --settings=zun_ui.test.settings commands =
dj111: pip install django>=1.11,<2
dj22: pip install django>=2.2,<2.3
python manage.py test {posargs} --settings=zun_ui.test.settings
# For installation of horizon on local # For installation of horizon on local
# NOTICE: this tox.ini requires horizon repository cloned in sibling directory. # NOTICE: this tox.ini requires horizon repository cloned in sibling directory.
@ -59,19 +62,6 @@ commands =
{[testenv:hz-local]commands} {[testenv:hz-local]commands}
{[testenv]commands} {[testenv]commands}
[testenv:py3-dj111]
basepython = python3
commands =
pip install django>=1.11,<2
{[testenv]commands}
[testenv:py3-dj111-local]
basepython = python3
commands =
{[testenv:hz-local]commands}
pip install django>=1.11,<2
{[testenv]commands}
[testenv:eslint] [testenv:eslint]
basepython = python3 basepython = python3
whitelist_externals = whitelist_externals =