Add python3 django 1.11 job instead of django 2.0 job

Django 2.0 is now used in tox py35 job, so there is no need for
py35dj20 job. Instead, Django 1.11 with python3 is not covered.

- py35dj20 job is dropped from tox.ini.
- python3-django111 is added to tox.ini.
  python3 is specified to basepython to avoid a specific python version.
- .zuul.yaml is updated to consume horizon-openstack-tox-python3-django111
  and drop horizon-openstack-tox-py35dj20.

Change-Id: I46bff5b942a31b2c33679e2f4414e003510f2687
This commit is contained in:
Akihiro Motoki 2018-06-12 23:56:30 +09:00
parent b27860f6fc
commit 6afba68e6b
2 changed files with 6 additions and 10 deletions

View File

@ -4,14 +4,10 @@
- openstack-tox-lower-constraints:
required-projects:
- openstack/horizon
- horizon-openstack-tox-py35dj20:
required-projects:
openstack/horizon
- horizon-openstack-tox-python3-django111
gate:
jobs:
- openstack-tox-lower-constraints:
required-projects:
- openstack/horizon
- horizon-openstack-tox-py35dj20:
required-projects:
openstack/horizon
- horizon-openstack-tox-python3-django111

View File

@ -30,11 +30,11 @@ commands =
coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
[testenv:py35dj20]
basepython = python3.5
[testenv:py3-dj111]
basepython = python3
commands =
pip install django>=2.0,<2.1
python manage.py test {posargs} --settings=blazar_dashboard.test.settings
pip install django>=1.11,<2
{[testenv]commands}
[testenv:eslint]
whitelist_externals = npm