Browse Source

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
James E. Blair 1 month ago
parent
commit
d20695814d
2 changed files with 4 additions and 6 deletions
  1. 2
    1
      test-requirements.txt
  2. 2
    5
      tox.ini

+ 2
- 1
test-requirements.txt View File

@@ -6,6 +6,7 @@ flake8
6 6
 # We need to pin Ansible to <2.6 until Zuul supports it, otherwise ansible-lint
7 7
 # picks the latest version which is not known to work yet.
8 8
 ansible>=2.5.1,<2.6
9
-ansible-lint
9
+ansible-lint<4
10
+hacking>=1.1.0,<2.0.0
10 11
 bashate>=0.2
11 12
 zuul-sphinx>=0.1.1

+ 2
- 5
tox.ini View File

@@ -27,7 +27,7 @@ commands =
27 27
 basepython = python3
28 28
 whitelist_externals = bash
29 29
 setenv =
30
-   ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library
30
+   ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/base/library
31 31
 passenv =
32 32
   # NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need
33 33
   # to export ANSIBLE_ROLES_PATH pointing to the currect repos.
@@ -38,10 +38,7 @@ passenv =
38 38
 deps =
39 39
   # Zuul is required to supply the zuul ansible modules for ansible-lint
40 40
   -egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul
41
-  ansible>=2.5.1,<2.6
42
-  ansible-lint
43
-  hacking>=0.10,<0.11
44
-  bashate>=0.2
41
+  -r{toxinidir}/test-requirements.txt
45 42
 commands =
46 43
   flake8 {posargs}
47 44
   # Ansible lint

Loading…
Cancel
Save