openstack/watcher-dashboard
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: I6fd838618048f7cd373e477d176e9ad2ee8e3f09
This commit is contained in:
manchandavishal 2019-10-05 10:53:34 +00:00 committed by Vishal Manchanda
parent 15a6bb084d
commit 7297b41b39
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.zuul.yaml
View File

@ -1,14 +1,9 @@
- project: - project:
templates: templates:
- check-requirements - check-requirements
- horizon-non-primary-django-jobs
- openstack-lower-constraints-jobs - openstack-lower-constraints-jobs
- 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

10
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 2.0 minversion = 2.0
envlist = py37,py36,py27,pep8 envlist = py37,py36,py27,py3-{dj111,dj22},pep8
skipsdist = True skipsdist = True
[testenv] [testenv]
@ -18,6 +18,8 @@ deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = commands =
dj111: pip install django>=1.11,<2
dj22: pip install django>=2.2,<2.3
rm -f .testrepository/times.dbm rm -f .testrepository/times.dbm
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
find . -type d -name "__pycache__" -delete find . -type d -name "__pycache__" -delete
@ -33,12 +35,6 @@ commands = flake8
basepython = python3 basepython = python3
commands = {posargs} commands = {posargs}
[testenv:py3-dj111]
basepython = python3
commands =
pip install django>=1.11,<2
{[testenv]commands}
[testenv:py27integration] [testenv:py27integration]
basepython = python2.7 basepython = python2.7
commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs} commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}