Merge "Use Horizon project template for django jobs"
This commit is contained in:
commit
297ce76ecf
@ -24,6 +24,7 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- horizon-nodejs10-jobs-nonvoting
|
- horizon-nodejs10-jobs-nonvoting
|
||||||
|
- horizon-non-primary-django-jobs
|
||||||
- openstack-python-jobs-horizon
|
- openstack-python-jobs-horizon
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
|
7
tox.ini
7
tox.ini
@ -1,6 +1,6 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 2.3.2
|
minversion = 2.3.2
|
||||||
envlist = py27,py37,pep8,npm
|
envlist = py37,py36,py3-{dj111,dj22},pep8,npm
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
@ -13,7 +13,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}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
commands = {envpython} {toxinidir}/manage.py test vitrage_dashboard {posargs} --exclude-tag integration {posargs}
|
commands =
|
||||||
|
dj111: pip install django>=1.11,<2
|
||||||
|
dj22: pip install django>=2.2,<2.3
|
||||||
|
{envpython} {toxinidir}/manage.py test vitrage_dashboard {posargs} --exclude-tag integration {posargs}
|
||||||
|
|
||||||
[testenv:integration]
|
[testenv:integration]
|
||||||
# Run integration tests only
|
# Run integration tests only
|
||||||
|
Loading…
Reference in New Issue
Block a user