summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2018-10-18 09:21:12 -0500
committerMonty Taylor <mordred@inaugust.com>2018-10-18 09:23:25 -0500
commit5cd8fbeb58fa04aee143270299862ddf3ed6428a (patch)
tree6b595584bf3c82cc44a55698b5d68fd9b2dbf641
parentd1465e8b1b5ba8af4619f7bb95551cbdbb42c059 (diff)
Update ANSIBLE_LIBRARY to use envsitepackagesdir
We install zuul via test-requirements, so the zuul files should be in a directory under the site-packges of the virtualenv that tox installed it in to. Update the path to point correctly to that location. Remove the ansible-lint skip tags which should now work because the library path should be pointing to a location that actually holds the content. Change-Id: If2d4b39267c4b9a3102a951143b568f8447af8d9
Notes
Notes (review): Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 19 Oct 2018 18:45:48 +0000 Reviewed-on: https://review.openstack.org/611622 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/prepare-workspace/tasks/main.yaml3
-rw-r--r--roles/start-zuul-console/tasks/main.yaml3
-rw-r--r--roles/upload-logs-swift/tasks/main.yaml3
-rw-r--r--roles/upload-logs/tasks/main.yaml3
-rw-r--r--tox.ini2
5 files changed, 1 insertions, 13 deletions
diff --git a/roles/prepare-workspace/tasks/main.yaml b/roles/prepare-workspace/tasks/main.yaml
index 0716190..48fc29a 100644
--- a/roles/prepare-workspace/tasks/main.yaml
+++ b/roles/prepare-workspace/tasks/main.yaml
@@ -1,9 +1,6 @@
1# TODO(pabelanger): Handle cleanup on static nodes 1# TODO(pabelanger): Handle cleanup on static nodes
2- name: Start zuul_console daemon. 2- name: Start zuul_console daemon.
3 zuul_console: 3 zuul_console:
4 tags:
5 # Avoid "no action detected in task" linter error
6 - skip_ansible_lint
7 4
8- name: Synchronize src repos to workspace directory. 5- name: Synchronize src repos to workspace directory.
9 synchronize: 6 synchronize:
diff --git a/roles/start-zuul-console/tasks/main.yaml b/roles/start-zuul-console/tasks/main.yaml
index 2fdcaf9..393a8f0 100644
--- a/roles/start-zuul-console/tasks/main.yaml
+++ b/roles/start-zuul-console/tasks/main.yaml
@@ -1,6 +1,3 @@
1# TODO(pabelanger): Handle cleanup on static nodes 1# TODO(pabelanger): Handle cleanup on static nodes
2- name: Start zuul_console daemon. 2- name: Start zuul_console daemon.
3 zuul_console: 3 zuul_console:
4 tags:
5 # Avoid "no action detected in task" linter error
6 - skip_ansible_lint
diff --git a/roles/upload-logs-swift/tasks/main.yaml b/roles/upload-logs-swift/tasks/main.yaml
index 870cc0c..f1d44ec 100644
--- a/roles/upload-logs-swift/tasks/main.yaml
+++ b/roles/upload-logs-swift/tasks/main.yaml
@@ -36,6 +36,3 @@
36 zuul: 36 zuul:
37 log_url: "{{ upload_results.url }}/" 37 log_url: "{{ upload_results.url }}/"
38 when: upload_results is defined 38 when: upload_results is defined
39 tags:
40 # Avoid "no action detected in task" linter error
41 - skip_ansible_lint
diff --git a/roles/upload-logs/tasks/main.yaml b/roles/upload-logs/tasks/main.yaml
index dcf8ad5..7092734 100644
--- a/roles/upload-logs/tasks/main.yaml
+++ b/roles/upload-logs/tasks/main.yaml
@@ -57,6 +57,3 @@
57 zuul: 57 zuul:
58 log_url: "{{ zuul_log_url }}/{{ zuul_log_path }}/" 58 log_url: "{{ zuul_log_url }}/{{ zuul_log_path }}/"
59 when: zuul_log_url is defined 59 when: zuul_log_url is defined
60 tags:
61 # Avoid "no action detected in task" linter error
62 - skip_ansible_lint
diff --git a/tox.ini b/tox.ini
index 3e3dbde..37099aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,7 @@ passenv =
32 # see openstack-zuul-jobs-linters job for more information. 32 # see openstack-zuul-jobs-linters job for more information.
33 ANSIBLE_ROLES_PATH 33 ANSIBLE_ROLES_PATH
34setenv = 34setenv =
35 ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library 35 ANSIBLE_LIBRARY= {envsitepackagesdir}/zuul/ansible/library
36whitelist_externals = bash 36whitelist_externals = bash
37commands = 37commands =
38 flake8 {posargs} 38 flake8 {posargs}