Browse Source

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
changes/22/611622/1
Monty Taylor 7 months ago
parent
commit
5cd8fbeb58
No account linked to committer's email address

+ 0
- 3
roles/prepare-workspace/tasks/main.yaml View File

@@ -1,9 +1,6 @@
1 1
 # TODO(pabelanger): Handle cleanup on static nodes
2 2
 - name: Start zuul_console daemon.
3 3
   zuul_console:
4
-  tags:
5
-    # Avoid "no action detected in task" linter error
6
-    - skip_ansible_lint
7 4
 
8 5
 - name: Synchronize src repos to workspace directory.
9 6
   synchronize:

+ 0
- 3
roles/start-zuul-console/tasks/main.yaml View File

@@ -1,6 +1,3 @@
1 1
 # TODO(pabelanger): Handle cleanup on static nodes
2 2
 - name: Start zuul_console daemon.
3 3
   zuul_console:
4
-  tags:
5
-    # Avoid "no action detected in task" linter error
6
-    - skip_ansible_lint

+ 0
- 3
roles/upload-logs-swift/tasks/main.yaml View File

@@ -36,6 +36,3 @@
36 36
       zuul:
37 37
         log_url: "{{ upload_results.url }}/"
38 38
   when: upload_results is defined
39
-  tags:
40
-    # Avoid "no action detected in task" linter error
41
-    - skip_ansible_lint

+ 0
- 3
roles/upload-logs/tasks/main.yaml View File

@@ -57,6 +57,3 @@
57 57
       zuul:
58 58
         log_url: "{{ zuul_log_url }}/{{ zuul_log_path }}/"
59 59
   when: zuul_log_url is defined
60
-  tags:
61
-    # Avoid "no action detected in task" linter error
62
-    - skip_ansible_lint

+ 1
- 1
tox.ini View File

@@ -32,7 +32,7 @@ passenv =
32 32
   # see openstack-zuul-jobs-linters job for more information.
33 33
   ANSIBLE_ROLES_PATH
34 34
 setenv =
35
-  ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library
35
+  ANSIBLE_LIBRARY= {envsitepackagesdir}/zuul/ansible/library
36 36
 whitelist_externals = bash
37 37
 commands =
38 38
   flake8 {posargs}

Loading…
Cancel
Save