summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-19 18:45:48 +0000
committerGerrit Code Review <review@openstack.org>2018-10-19 18:45:48 +0000
commit346dfe8d6874ab6f0e26109a52ca4664df106eed (patch)
tree93af0ff44460271e1b2bc5e14c10603f3c303740
parent5b51d9dfe533d5e273d4c9fd2a32ae2ae65be894 (diff)
parent5cd8fbeb58fa04aee143270299862ddf3ed6428a (diff)
Merge "Update ANSIBLE_LIBRARY to use envsitepackagesdir"
-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}