Update zuul ansible location
With multi-ansible support, the location of the zuul plugins/modules has moved. Also, pin ansible-lint to match the version in zuul-jobs. Note we move all the deps for the linters job into test-requirements.txt then consume the deps there under the tox linters target. This makes it easier to see where deps are listed. Finally bump hacking version up so that modern flake8 works with it. Change-Id: I8e2cf1f2276bca5a912fed52062628b3b9d0d6d9
This commit is contained in:
parent
fef2b11ebd
commit
d20695814d
@ -6,6 +6,7 @@ flake8
|
||||
# We need to pin Ansible to <2.6 until Zuul supports it, otherwise ansible-lint
|
||||
# picks the latest version which is not known to work yet.
|
||||
ansible>=2.5.1,<2.6
|
||||
ansible-lint
|
||||
ansible-lint<4
|
||||
hacking>=1.1.0,<2.0.0
|
||||
bashate>=0.2
|
||||
zuul-sphinx>=0.1.1
|
||||
|
7
tox.ini
7
tox.ini
@ -27,7 +27,7 @@ commands =
|
||||
basepython = python3
|
||||
whitelist_externals = bash
|
||||
setenv =
|
||||
ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library
|
||||
ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/base/library
|
||||
passenv =
|
||||
# NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need
|
||||
# to export ANSIBLE_ROLES_PATH pointing to the currect repos.
|
||||
@ -38,10 +38,7 @@ passenv =
|
||||
deps =
|
||||
# Zuul is required to supply the zuul ansible modules for ansible-lint
|
||||
-egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul
|
||||
ansible>=2.5.1,<2.6
|
||||
ansible-lint
|
||||
hacking>=0.10,<0.11
|
||||
bashate>=0.2
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands =
|
||||
flake8 {posargs}
|
||||
# Ansible lint
|
||||
|
Loading…
Reference in New Issue
Block a user