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: I8df240f0f297c0387bef304e285ce8dd9f34c85d
This commit is contained in:
parent
83a0e432fe
commit
73b7b9cd07
10
.zuul.yaml
10
.zuul.yaml
|
@ -1,6 +1,7 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- check-requirements
|
- check-requirements
|
||||||
|
- horizon-non-primary-django-jobs
|
||||||
- openstack-cover-jobs-horizon
|
- openstack-cover-jobs-horizon
|
||||||
- openstack-lower-constraints-jobs-horizon
|
- openstack-lower-constraints-jobs-horizon
|
||||||
- openstack-python-jobs-horizon
|
- openstack-python-jobs-horizon
|
||||||
|
@ -13,15 +14,6 @@
|
||||||
voting: false
|
voting: false
|
||||||
- manila-ui-integration-tests:
|
- manila-ui-integration-tests:
|
||||||
voting: false
|
voting: false
|
||||||
- horizon-openstack-tox-python3-django111
|
|
||||||
- horizon-openstack-tox-py27dj19
|
|
||||||
- horizon-openstack-tox-py27dj110
|
|
||||||
gate:
|
|
||||||
jobs:
|
|
||||||
- horizon-openstack-tox-python3-django111
|
|
||||||
- horizon-openstack-tox-py27dj19
|
|
||||||
- horizon-openstack-tox-py27dj110
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: manila-ui-dsvm
|
name: manila-ui-dsvm
|
||||||
parent: legacy-dsvm-base
|
parent: legacy-dsvm-base
|
||||||
|
|
29
tox.ini
29
tox.ini
|
@ -1,6 +1,6 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 1.6
|
minversion = 1.6
|
||||||
envlist = py27,py37,pep8,py27dj19,py27dj110,py3-dj111
|
envlist = py27,py37,pep8,py3-{dj111,dj22}
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
@ -11,7 +11,10 @@ setenv =
|
||||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
deps = -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 = /bin/bash run_tests.sh -N --no-pep8 {posargs}
|
commands =
|
||||||
|
dj111: pip install django>=1.11,<2
|
||||||
|
dj22: pip install django>=2.2,<2.3
|
||||||
|
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
||||||
|
|
||||||
[testenv:py27]
|
[testenv:py27]
|
||||||
setenv = DJANGO_SETTINGS_MODULE=manila_ui.tests.settings
|
setenv = DJANGO_SETTINGS_MODULE=manila_ui.tests.settings
|
||||||
|
@ -48,28 +51,6 @@ commands = flake8
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
# Django-1.8 is LTS
|
|
||||||
[testenv:py27dj18]
|
|
||||||
basepython = python2.7
|
|
||||||
commands = pip install django>=1.8,<1.9
|
|
||||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
|
||||||
|
|
||||||
[testenv:py27dj19]
|
|
||||||
basepython = python2.7
|
|
||||||
commands = pip install django>=1.9,<1.10
|
|
||||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
|
||||||
|
|
||||||
[testenv:py27dj110]
|
|
||||||
basepython = python2.7
|
|
||||||
commands = pip install django>=1.10,<1.11
|
|
||||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
|
||||||
|
|
||||||
[testenv:py3-dj111]
|
|
||||||
basepython = python3
|
|
||||||
commands =
|
|
||||||
pip install django>=1.11,<2
|
|
||||||
{[testenv]commands}
|
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands = {toxinidir}/tools/cover.sh {posargs}
|
commands = {toxinidir}/tools/cover.sh {posargs}
|
||||||
|
|
Loading…
Reference in New Issue