summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--playbooks/base-test/post.yaml3
-rw-r--r--playbooks/base/post.yaml3
-rw-r--r--test-requirements.txt3
-rw-r--r--tox.ini7
4 files changed, 10 insertions, 6 deletions
diff --git a/playbooks/base-test/post.yaml b/playbooks/base-test/post.yaml
index a021a08..0318870 100644
--- a/playbooks/base-test/post.yaml
+++ b/playbooks/base-test/post.yaml
@@ -3,5 +3,8 @@
3 - fetch-output 3 - fetch-output
4 4
5- hosts: all 5- hosts: all
6 # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
7 # successful jobs.
8 ignore_errors: yes
6 roles: 9 roles:
7 - remove-build-sshkey 10 - remove-build-sshkey
diff --git a/playbooks/base/post.yaml b/playbooks/base/post.yaml
index a021a08..0318870 100644
--- a/playbooks/base/post.yaml
+++ b/playbooks/base/post.yaml
@@ -3,5 +3,8 @@
3 - fetch-output 3 - fetch-output
4 4
5- hosts: all 5- hosts: all
6 # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
7 # successful jobs.
8 ignore_errors: yes
6 roles: 9 roles:
7 - remove-build-sshkey 10 - remove-build-sshkey
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
6# We need to pin Ansible to <2.6 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.5.1,<2.6 8ansible>=2.5.1,<2.6
9ansible-lint 9ansible-lint<4
10hacking>=1.1.0,<2.0.0
10bashate>=0.2 11bashate>=0.2
11zuul-sphinx>=0.1.1 12zuul-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 =
27basepython = python3 27basepython = python3
28whitelist_externals = bash 28whitelist_externals = bash
29setenv = 29setenv =
30 ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library 30 ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/base/library
31passenv = 31passenv =
32 # NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need 32 # NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need
33 # to export ANSIBLE_ROLES_PATH pointing to the currect repos. 33 # to export ANSIBLE_ROLES_PATH pointing to the currect repos.
@@ -38,10 +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.5.1,<2.6 41 -r{toxinidir}/test-requirements.txt
42 ansible-lint
43 hacking>=0.10,<0.11
44 bashate>=0.2
45commands = 42commands =
46 flake8 {posargs} 43 flake8 {posargs}
47 # Ansible lint 44 # Ansible lint