ols-tests-django

Merge lp:~vila/ols-tests-django/support-django-1.11 into lp:ols-tests-django

  1. support-django-1.11
  2. Merge into trunk
Proposed by Vincent Ladeuil
Status: Needs review
Proposed branch: lp:~vila/ols-tests-django/support-django-1.11
Merge into: lp:ols-tests-django
Diff against target: 22 lines (+8/-1)
2 files modified
ols-vms.conf (+6/-0)
tox.ini (+2/-1)
To merge this branch: bzr merge lp:~vila/ols-tests-django/support-django-1.11
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+322205@code.launchpad.net

Commit message

Move to xenial, no need for trusty.

Description of the change

Adding jenkaas definition to go to xenial.

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve
Reply

Unmerged revisions

26. By Vincent Ladeuil

Merge trunk resolving conflicts.

25. By Vincent Ladeuil

Going to xenial on ols jenkaas.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'ols-vms.conf'
2--- ols-vms.conf 1970-01-01 00:00:00 +0000
3+++ ols-vms.conf 2017-04-07 14:36:24 +0000
4@@ -0,0 +1,6 @@
5+[ols-tests-django]
6+vm.class = lxd
7+vm.release = xenial
8+vm.architecture = amd64
9+vm.update = True
10+vm.packages = make, python, python3, tox, virtualenv, python-pip, python3-pip
11
12=== modified file 'tox.ini'
13--- tox.ini 2017-04-07 13:54:43 +0000
14+++ tox.ini 2017-04-07 14:36:24 +0000
15@@ -1,6 +1,7 @@
16 [tox]
17 envlist =
18- py2.7-django1.6, py2.7-django1.7, py2.7-django1.8, py2.7-django1.9, py2.7-django1.10, py2.7-django1.11,
19+ py2.7-django1.6, py2.7-django1.7, py2.7-django1.8, py2.7-django1.9,
20+ py2.7-django1.10, py2.7-django1.11,
21 py3-django1.11,
22 pay-precise, sca-trusty, sso-trusty
23

Subscribers

People subscribed via source and target branches