From d20695814d475ecefd06bdf154b8386f65035846 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Mon, 18 Mar 2019 09:13:11 -0700
Subject: [PATCH] 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
---
 test-requirements.txt | 3 ++-
 tox.ini               | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index ee18cc4..76dc1f4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -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
diff --git a/tox.ini b/tox.ini
index d1e3f4b..a964e98 100644
--- a/tox.ini
+++ b/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