Merge ~smoser/curtin:feature/add-xenial-tox-env into curtin:master

Proposed by Scott Moser
Status: Merged
Approved by: Scott Moser
Approved revision: e4427f78bd94938ac0d73c401b60cbe8e4e131b0
Merge reported by: Scott Moser
Merged at revision: f98eb1bf6ee15a8a4abee7cefa0768f058cac7e9
Proposed branch: ~smoser/curtin:feature/add-xenial-tox-env
Merge into: curtin:master
Diff against target: 46 lines (+27/-1)
1 file modified
tox.ini (+27/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Review via email: mp+345947@code.launchpad.net

Commit message

tox: add a xenial environments, default envlist changes.

A previous commit used mock.assert_called, which is not
present in xenial versions of mock so build would fail on xenial.
Due to bugs that are present in the trusty versions of mock it would
pass there.

So we add a tox environment 'xenial-py3' and add that to the
default set of environments that are run with a 'tox' invocation.

Other changes to the envlist here:
a.) make it multiple lines for easier future diffing.
b.) run py3-flake8 first, it runs quickly and gives good feedback.
c.) drop trusty-check which was running trusty pyflakes. We do not
    run pyflakes in package build any more.
d.) replace trusty-py3 with xenial-py3. Just to save time in default 'tox'
    run we only run one "old" python3 unit tests.

Description of the change

see commit message

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ryan Harper (raharper) :
Revision history for this message
Ryan Harper (raharper) wrote :

From verbal discussions:

1) No need for pep8, pyflakes as those are not called in the make check path
2) We should add xenial-py27 but we can drop trusty-py27

e358ac3... by Scott Moser

updates

Revision history for this message
Scott Moser (smoser) wrote :

Changes I made:

a.) move py3-flake8 up to run early in 'tox' default. it runs fast and catches some errors.
b.) drop running of 'trusty-check' by default. we do not run this in our package builds any more.
c.) add xenial-py27 environment. (and make xenial-py3 share the base 'xenial' with it).
d.) we are not running pyflakes or pycodestyle/pep8 in xenial- environments.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

Looks good, some general questions about the envlist inline.

Revision history for this message
Chad Smith (chad.smith) :
Revision history for this message
Chad Smith (chad.smith) wrote :

Approve given the minor tox fix inline

review: Approve
e4427f7... by Scott Moser

fix use of python3 by xenial-py27. thanks chad.

Revision history for this message
Scott Moser (smoser) :
Revision history for this message
Scott Moser (smoser) wrote :

At some point in the future, further changes will come.

I put a trello card at:
  https://trello.com/c/HTMRxCd2

And a hackmd.io at https://hackmd.io/9L0oxV1oRUOlSqoSBdP1ZQ?view
that describes what we want to get to.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/curtin/commit/?id=f98eb1bf

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tox.ini b/tox.ini
2index c1748c3..6f14381 100644
3--- a/tox.ini
4+++ b/tox.ini
5@@ -1,7 +1,14 @@
6 [tox]
7 minversion = 1.6
8 skipsdist = True
9-envlist = py27, py3, py3-flake8, py3-pylint, py27-pylint, trusty-check, trusty-py27, trusty-py3
10+envlist =
11+ py3-flake8,
12+ py27,
13+ py3,
14+ py3-pylint,
15+ py27-pylint,
16+ trusty-py27,
17+ xenial-py3
18
19 [tox:jenkins]
20 downloadcache = ~/cache/pip
21@@ -91,6 +98,25 @@ basepython = python3
22 commands = {envpython} {toxinidir}/tools/noproxy nosetests \
23 {posargs:tests/unittests}
24
25+[testenv:xenial]
26+deps =
27+ mock==1.3.0
28+ nose==1.3.7
29+ pyyaml==3.11
30+ oauthlib==1.0.3
31+
32+[testenv:xenial-py27]
33+basepython = python27
34+deps = {[testenv:xenial]deps}
35+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
36+ {posargs:tests/unittests}
37+
38+[testenv:xenial-py3]
39+basepython = python3
40+deps = {[testenv:xenial]deps}
41+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
42+ {posargs:tests/unittests}
43+
44 [testenv:tip-pycodestyle]
45 commands = {envpython} -m pycodestyle {posargs:curtin/ tests/ tools/}
46 deps = pycodestyle

Subscribers

People subscribed via source and target branches