summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-24 16:23:22 +0000
committerGerrit Code Review <review@openstack.org>2018-08-24 16:23:22 +0000
commit54e633d25e927f416e4eafc0282aa92e6d858aca (patch)
tree5b05e5cb5d2533907f91ebc0c83d6c581e74f7fa
parentcb83b17f9f9fb2614b3676eddd1e1bb4c37f8d37 (diff)
parent7deaf1142f8755063f58591aa5e5367e76212075 (diff)
Merge "Update test-requirements ansible version"
-rw-r--r--test-requirements.txt4
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index d786ee5..ee18cc4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,9 +3,9 @@
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4flake8 4flake8
5 5
6# We need to pin Ansible to <2.4 until Zuul supports it, otherwise ansible-lint 6# We need to pin Ansible to <2.6 until Zuul supports it, otherwise ansible-lint
7# picks the latest version which is not known to work yet. 7# picks the latest version which is not known to work yet.
8ansible<2.4 8ansible>=2.5.1,<2.6
9ansible-lint 9ansible-lint
10bashate>=0.2 10bashate>=0.2
11zuul-sphinx>=0.1.1 11zuul-sphinx>=0.1.1
diff --git a/tox.ini b/tox.ini
index 72475f7..d1e3f4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ passenv =
38deps = 38deps =
39 # Zuul is required to supply the zuul ansible modules for ansible-lint 39 # Zuul is required to supply the zuul ansible modules for ansible-lint
40 -egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul 40 -egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul
41 ansible<2.4.0 41 ansible>=2.5.1,<2.6
42 ansible-lint 42 ansible-lint
43 hacking>=0.10,<0.11 43 hacking>=0.10,<0.11
44 bashate>=0.2 44 bashate>=0.2