From 0eaa5cf59ad56b6af7e8af6dc3acadd776b56522 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Fri, 8 Jan 2021 08:57:26 +0000
Subject: [PATCH] Upgrade ansible-lint to 5.0
- bumps ansible-lint to 5.0
- updates our custom rules to make them compatible with 5.0
- replace custom module mocking with native ansible-lint ones
- remove custom call of ansible-playbook --syntax-check as now this
is done by ansible-lint
- assured molecule vars are hosted under a vars/ folder in order to
avoid confusing linter detection.
- replaced custom rule for loop var names in role as now this this an
optional core feature of the linter (see config)
- replaced custom rule no-same-owner with opt-in one (see config)
Change-Id: I233fae8c9036d295968a97ee80e07fde8846c633
---
.ansible-lint | 17 ++--
.rules/ZuulJobsNamespaceLoopVar.py | 55 -------------
.rules/ZuulJobsNoSameOwner.py | 81 -------------------
linters-requirements.txt | 3 +-
roles/ensure-bazelisk/tasks/main.yaml | 2 +-
.../tasks/Debian.yaml | 2 +-
roles/ensure-packer/tasks/install-packer.yaml | 6 +-
roles/ensure-rust/tasks/rustup.yaml | 2 +-
.../tasks/install-terraform.yaml | 8 +-
roles/fetch-sphinx-output/tasks/main.yaml | 2 +-
roles/fetch-tox-output/tasks/main.yaml | 2 +-
roles/revoke-sudo/tasks/main.yaml | 2 +-
roles/terraform/tasks/main.yaml | 2 +-
roles/use-buildset-registry/tasks/main.yaml | 2 +-
.../handlers/main.yaml | 5 --
.../handlers/main.yaml | 5 --
.../tasks/main.yaml | 6 --
.../tasks/main.yaml | 6 --
.../tasks/main.yaml | 7 --
.../tasks/main.yaml | 4 -
.../tasks/main.yaml | 4 -
.../tasks/main.yaml | 5 --
.../tasks/main.yaml | 5 --
.../handlers-loopvar-loop/handlers/main.yaml | 8 --
.../handlers-loopvar-with/handlers/main.yaml | 8 --
.../task-block-loopvar-loop/tasks/main.yaml | 8 --
.../task-block-loopvar-with/tasks/main.yaml | 8 --
.../tasks/main.yaml | 5 --
.../tasks/main.yaml | 7 --
.../tasks/main.yaml | 6 --
.../roles/tasks-loopvar-loop/tasks/main.yaml | 8 --
.../roles/tasks-loopvar-with/tasks/main.yaml | 7 --
.../faulty/roles/block/tasks/main.yaml | 4 -
.../faulty/roles/nested-block/tasks/main.yaml | 5 --
.../faulty/roles/synchronize/tasks/main.yaml | 3 -
.../roles/unarchive-bz2/tasks/main.yaml | 3 -
.../roles/unarchive-delegated/tasks/main.yaml | 4 -
.../faulty/roles/unarchive-gz/tasks/main.yaml | 3 -
.../roles/unarchive-tar/tasks/main.yaml | 3 -
.../faulty/roles/unarchive-xz/tasks/main.yaml | 3 -
.../unarchive-zip-same-owner/tasks/main.yaml | 6 --
.../roles/unarchive-zip/tasks/main.yaml | 5 --
.../synchronize-delegated/tasks/main.yaml | 4 -
.../synchronize-no-same-owner/tasks/main.yaml | 5 --
.../unarchive-no-same-owner/tasks/main.yaml | 5 --
.../unarchive-remote-src/tasks/main.yaml | 4 -
.../tasks/main.yaml | 3 -
.../ansible-lint-rules/ansible-lint.yaml | 5 --
test-playbooks/ansible-lint-rules/run.yaml | 61 --------------
test-playbooks/python/tox.yaml | 1 -
tests/fake-ansible/library/zuul_console.py | 6 --
tests/fake-ansible/library/zuul_return.py | 12 ---
tox.ini | 5 +-
zuul-tests.d/ansible-lint-rules.yaml | 18 -----
54 files changed, 30 insertions(+), 436 deletions(-)
delete mode 100644 .rules/ZuulJobsNamespaceLoopVar.py
delete mode 100644 .rules/ZuulJobsNoSameOwner.py
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-loop/handlers/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-with/handlers/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-loop/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-with/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-nested-block-missing-loopvar/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-loop/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-with/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-loop/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-with/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-loop/handlers/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-with/handlers/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-loop/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-with/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-missing-loopvar-loop-skip/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-loop/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-with/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-loop/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-with/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/block/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/nested-block/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/synchronize/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-bz2/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-delegated/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-gz/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-tar/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-xz/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip-same-owner/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-delegated/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-no-same-owner/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-no-same-owner/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-remote-src/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-unknown-file-ending/tasks/main.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/ansible-lint.yaml
delete mode 100644 test-playbooks/ansible-lint-rules/run.yaml
delete mode 100644 tests/fake-ansible/library/zuul_console.py
delete mode 100644 tests/fake-ansible/library/zuul_return.py
delete mode 100644 zuul-tests.d/ansible-lint-rules.yaml
diff --git a/.ansible-lint b/.ansible-lint
index aafdf2ab5..fdb864a18 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -3,11 +3,16 @@ exclude_paths:
parseable: true
quiet: false
skip_list:
- - '106' # Role name does not match ``^[a-z][a-z0-9_]+$`` pattern
- - '204' # Lines should be no longer than 160 chars
- - '301' # Commands should not change things if nothing needs doing
- - '701' # No 'galaxy_info' found
-rulesdir:
- - ./.rules/
+ - meta-no-info # No 'galaxy_info' found
+ - no-changed-when # Commands should not change things if nothing needs doing
+ - no-tabs # Most files should not contain tabs
+ - role-name # Role name does not match ``^[a-z][a-z0-9_]+$`` pattern
use_default_rules: true
verbosity: 1
+mock_modules:
+ - zuul_console
+ - zuul_return
+loop_var_prefix: zj_
+# Enable rules that are disabled by default:
+enable_list:
+ - no-same-owner
diff --git a/.rules/ZuulJobsNamespaceLoopVar.py b/.rules/ZuulJobsNamespaceLoopVar.py
deleted file mode 100644
index 3e513d1df..000000000
--- a/.rules/ZuulJobsNamespaceLoopVar.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from ansiblelint import AnsibleLintRule
-
-
-class ZuulJobsNamespaceLoopVar(AnsibleLintRule):
-
- id = 'ZUULJOBS0001'
- shortdesc = 'Loop vars should have zj_ prefix'
- description = """
-Check for tasks that does not follow
-the policy of namespacing loop variables with zj_ prefix.
-See: \
-https://zuul-ci.org/docs/zuul-jobs/policy.html\
-#loops-in-roles
-"""
-
- tags = {'zuul-jobs-namespace-loop-var'}
-
- def matchplay(self, file, task):
- results = []
- if file.get('type') not in ('tasks', 'handlers'):
- return results
-
- results.extend(self.handle_play(task))
- return results
-
- def handle_play(self, task):
- results = []
- if 'block' in task:
- results.extend(self.handle_playlist(task['block']))
- else:
- results.extend(self.handle_task(task))
- return results
-
- def handle_playlist(self, playlist):
- results = []
- for play in playlist:
- results.extend(self.handle_play(play))
- return results
-
- def handle_task(self, task):
- results = []
- has_loop = 'loop' in task
- for key in task.keys():
- if key.startswith('with_'):
- has_loop = True
-
- if has_loop:
- if 'loop_control' not in task:
- results.append(("", self.shortdesc))
- elif 'loop_var' not in task.get('loop_control'):
- results.append(("", self.shortdesc))
- elif not task.get('loop_control')\
- .get('loop_var').startswith('zj_'):
- results.append(("", self.shortdesc))
- return results
diff --git a/.rules/ZuulJobsNoSameOwner.py b/.rules/ZuulJobsNoSameOwner.py
deleted file mode 100644
index bbe05a23a..000000000
--- a/.rules/ZuulJobsNoSameOwner.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import re
-
-from ansiblelint import AnsibleLintRule
-
-
-class ZuulJobsNoSameOwner(AnsibleLintRule):
-
- id = 'ZUULJOBS0002'
- shortdesc = 'Owner should not be kept between executor and remote'
- description = """
-Since there is no way to guarantee that the user and or group on the remote
-node also exist on the executor and vice versa, owner and group should not
-be preserved when transfering files between them.
-
-See:
-https://zuul-ci.org/docs/zuul-jobs/policy.html\
-#preservation-of-owner-between-executor-and-remote
-"""
-
- tags = {'zuul-jobs-no-same-owner'}
-
- def matchplay(self, file, play):
- results = []
- if file.get('type') not in ('tasks',
- 'handlers',
- 'playbooks'):
- return results
-
- results.extend(self.handle_play(play))
- return results
-
- def handle_play(self, task):
- results = []
- if 'block' in task:
- results.extend(self.handle_playlist(task['block']))
- else:
- results.extend(self.handle_task(task))
- return results
-
- def handle_playlist(self, playlist):
- results = []
- for play in playlist:
- results.extend(self.handle_play(play))
- return results
-
- def handle_task(self, task):
- results = []
- if 'synchronize' in task:
- if self.handle_synchronize(task):
- results.append(("", self.shortdesc))
- elif 'unarchive' in task:
- if self.handle_unarchive(task):
- results.append(("", self.shortdesc))
-
- return results
-
- def handle_synchronize(self, task):
- if task.get('delegate_to') is not None:
- return False
-
- synchronize = task['synchronize']
- archive = synchronize.get('archive', True)
-
- if synchronize.get('owner', archive) or\
- synchronize.get('group', archive):
- return True
- return False
-
- def handle_unarchive(self, task):
- unarchive = task['unarchive']
- delegate_to = task.get('delegate_to')
-
- if delegate_to == 'localhost' or\
- delegate_to != 'localhost' and 'remote_src' not in unarchive:
- if unarchive['src'].endswith('zip'):
- if '-X' in unarchive.get('extra_opts', []):
- return True
- if re.search(r'.*\.tar(\.(gz|bz2|xz))?$', unarchive['src']):
- if '--no-same-owner' not in unarchive.get('extra_opts', []):
- return True
- return False
diff --git a/linters-requirements.txt b/linters-requirements.txt
index 27e90e3e3..f240a0c4d 100644
--- a/linters-requirements.txt
+++ b/linters-requirements.txt
@@ -1,5 +1,6 @@
# linters have different requirements than test ones, some would
# conflict, like ansible version required by ansible-lint.
+ansible>=2.9,<2.11 # required by ansible-lint
flake8
yamllint>=1.23.0
-ansible-lint>=4.3.7,<5
+ansible-lint>=5.0.3rc1,<5.1
diff --git a/roles/ensure-bazelisk/tasks/main.yaml b/roles/ensure-bazelisk/tasks/main.yaml
index dce2b33b9..c9de3596d 100644
--- a/roles/ensure-bazelisk/tasks/main.yaml
+++ b/roles/ensure-bazelisk/tasks/main.yaml
@@ -19,7 +19,7 @@
register: bazelisk_downloaded
# This will apply to further plays and playbooks
-- name: Set bazelisk_executable fact
+- name: Set bazelisk_executable fact # noqa no-handler
set_fact:
bazelisk_executable: "{{ bazelisk_target }}"
cacheable: true
diff --git a/roles/ensure-package-repositories/tasks/Debian.yaml b/roles/ensure-package-repositories/tasks/Debian.yaml
index 975cff302..32122e878 100644
--- a/roles/ensure-package-repositories/tasks/Debian.yaml
+++ b/roles/ensure-package-repositories/tasks/Debian.yaml
@@ -25,7 +25,7 @@
loop_var: zj_item
register: _add_apt_repos
-- name: Update APT cache
+- name: Update APT cache # noqa no-handler
become: true
apt:
update_cache: yes
diff --git a/roles/ensure-packer/tasks/install-packer.yaml b/roles/ensure-packer/tasks/install-packer.yaml
index 04ecc7b6b..2d12261d9 100644
--- a/roles/ensure-packer/tasks/install-packer.yaml
+++ b/roles/ensure-packer/tasks/install-packer.yaml
@@ -7,9 +7,9 @@
- name: Set packer checksum
set_fact:
- packer_checksum: "{{\
- packer_version_checksums.content |\
- regex_search( '[a-z0-9]+ ' + packer_package) |\
+ packer_checksum: "{{ \
+ packer_version_checksums.content | \
+ regex_search( '[a-z0-9]+ ' + packer_package) | \
regex_replace( '(?P<checksum>[a-z0-9]+) ' + packer_package, '\\g<checksum>')
}}"
diff --git a/roles/ensure-rust/tasks/rustup.yaml b/roles/ensure-rust/tasks/rustup.yaml
index 3341b5f9a..a2cffdd75 100644
--- a/roles/ensure-rust/tasks/rustup.yaml
+++ b/roles/ensure-rust/tasks/rustup.yaml
@@ -1,5 +1,5 @@
- name: Install Rust
- shell: | # noqa 303
+ shell: | # noqa command-instead-of-module
set -o pipefail
curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain {{ ensure_rust_rustup_toolchain }}
environment:
diff --git a/roles/ensure-terraform/tasks/install-terraform.yaml b/roles/ensure-terraform/tasks/install-terraform.yaml
index 8f8e07474..8c4bab49f 100644
--- a/roles/ensure-terraform/tasks/install-terraform.yaml
+++ b/roles/ensure-terraform/tasks/install-terraform.yaml
@@ -1,5 +1,5 @@
- name: Check if unzip is installed
- command: unzip -v # noqa 303
+ command: unzip -v # noqa command-instead-of-module
failed_when: false
register: _unzip_probe
@@ -18,9 +18,9 @@
- name: Set terraform checksum
set_fact:
- terraform_checksum: "{{\
- terraform_version_checksums.content |\
- regex_search( '[a-z0-9]+ ' + terraform_package) |\
+ terraform_checksum: "{{ \
+ terraform_version_checksums.content | \
+ regex_search( '[a-z0-9]+ ' + terraform_package) | \
regex_replace( '(?P<checksum>[a-z0-9]+) ' + terraform_package, '\\g<checksum>')
}}"
diff --git a/roles/fetch-sphinx-output/tasks/main.yaml b/roles/fetch-sphinx-output/tasks/main.yaml
index 5b32bd662..2b33ac7d9 100644
--- a/roles/fetch-sphinx-output/tasks/main.yaml
+++ b/roles/fetch-sphinx-output/tasks/main.yaml
@@ -8,7 +8,7 @@
group: no
when: not zuul_use_fetch_output
-- name: Copy sphinx build html # noqa 208
+- name: Copy sphinx build html # noqa risky-file-permissions
copy:
dest: "{{ zuul_output_dir }}/logs/"
src: "{{ sphinx_output_src }}"
diff --git a/roles/fetch-tox-output/tasks/main.yaml b/roles/fetch-tox-output/tasks/main.yaml
index e4fc583c4..1ef72acbb 100644
--- a/roles/fetch-tox-output/tasks/main.yaml
+++ b/roles/fetch-tox-output/tasks/main.yaml
@@ -62,7 +62,7 @@
envlist: "{{ tox_all_environments.stdout_lines }}"
when: tox_all_environments.stdout_lines is defined
-- name: Copy tox logs # noqa 208
+- name: Copy tox logs # noqa risky-file-permissions
copy:
dest: "{{ zuul_output_dir }}/logs/tox/"
src: "{{ zuul_work_dir }}/.tox/{{ zj_testenv }}/log/"
diff --git a/roles/revoke-sudo/tasks/main.yaml b/roles/revoke-sudo/tasks/main.yaml
index 6ad1efb0a..720727bcf 100644
--- a/roles/revoke-sudo/tasks/main.yaml
+++ b/roles/revoke-sudo/tasks/main.yaml
@@ -9,7 +9,7 @@
# try to delete the next file.
- name: Remove sudo access for zuul user.
become: yes
- command: rm -rf /etc/sudoers.d/zuul /etc/sudoers.d/90-cloud-init-users # noqa 302
+ command: rm -rf /etc/sudoers.d/zuul /etc/sudoers.d/90-cloud-init-users # noqa deprecated-command-syntax
when: zuul_is_sudoer.rc == 0
- name: Prove that general sudo access is actually revoked.
diff --git a/roles/terraform/tasks/main.yaml b/roles/terraform/tasks/main.yaml
index 487226964..19a11c131 100644
--- a/roles/terraform/tasks/main.yaml
+++ b/roles/terraform/tasks/main.yaml
@@ -89,7 +89,7 @@
- name: Get path to main.tf relative to the repo root
when: terraform_command == "plan"
register: main_file_location
- command: "git ls-files --full-name main.tf" # noqa 303
+ command: "git ls-files --full-name main.tf" # noqa command-instead-of-module
args:
chdir: "{{ zuul_work_dir }}"
diff --git a/roles/use-buildset-registry/tasks/main.yaml b/roles/use-buildset-registry/tasks/main.yaml
index 13c902bc9..8c1a64580 100644
--- a/roles/use-buildset-registry/tasks/main.yaml
+++ b/roles/use-buildset-registry/tasks/main.yaml
@@ -42,7 +42,7 @@
dest: "{{ ca_dir }}/{{ buildset_registry_alias }}.crt"
mode: 0644
register: _tls_ca
-- name: Update CA certs
+- name: Update CA certs # noqa: no-handler
command: "{{ ca_command }}"
become: true
when: _tls_ca is changed
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-loop/handlers/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-loop/handlers/main.yaml
deleted file mode 100644
index bce36bb64..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-loop/handlers/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- debug:
- msg: "I should fail: {{ item }}"
- loop:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-with/handlers/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-with/handlers/main.yaml
deleted file mode 100644
index 3a9472d93..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/handlers-missing-loopvar-with/handlers/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- debug:
- msg: "I should fail: {{ item }}"
- with_list:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-loop/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-loop/tasks/main.yaml
deleted file mode 100644
index c822edf52..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-loop/tasks/main.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- block:
- - debug:
- var: item
- loop:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-with/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-with/tasks/main.yaml
deleted file mode 100644
index 1c730fc02..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-block-missing-loopvar-with/tasks/main.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- block:
- - debug:
- var: item
- with_items:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-nested-block-missing-loopvar/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-nested-block-missing-loopvar/tasks/main.yaml
deleted file mode 100644
index e2a93c0bd..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/task-nested-block-missing-loopvar/tasks/main.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- block:
- - block:
- - debug:
- var: item
- loop:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-loop/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-loop/tasks/main.yaml
deleted file mode 100644
index 49ced8fc4..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-loop/tasks/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- include: "{{ item }}.yaml"
- loop:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-with/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-with/tasks/main.yaml
deleted file mode 100644
index 3d905137a..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-include-missing-loopvar-with/tasks/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- include: "{{ item }}.yaml"
- with_list:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-loop/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-loop/tasks/main.yaml
deleted file mode 100644
index f24686ec2..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-loop/tasks/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- debug:
- msg: "I should error: {{ item }} "
- loop:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-with/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-with/tasks/main.yaml
deleted file mode 100644
index fffaef438..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/faulty/roles/tasks-missing-loopvar-with/tasks/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- debug:
- msg: "I should error: {{ item }} "
- with_list:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-loop/handlers/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-loop/handlers/main.yaml
deleted file mode 100644
index 88a7e5999..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-loop/handlers/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- debug:
- msg: "I should pass: {{ zj_item }}"
- loop:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
-
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-with/handlers/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-with/handlers/main.yaml
deleted file mode 100644
index 27a582924..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/handlers-loopvar-with/handlers/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- debug:
- msg: "I should pass: {{ zj_item }}"
- with_list:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
-
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-loop/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-loop/tasks/main.yaml
deleted file mode 100644
index d1e0c1b72..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-loop/tasks/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- block:
- - debug:
- msg: zj_item
- loop:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-with/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-with/tasks/main.yaml
deleted file mode 100644
index b28fdacdd..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-block-loopvar-with/tasks/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- block:
- - debug:
- msg: zj_item
- with_items:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-missing-loopvar-loop-skip/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-missing-loopvar-loop-skip/tasks/main.yaml
deleted file mode 100644
index 4277bc7da..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/task-missing-loopvar-loop-skip/tasks/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- debug: # noqa ZUULJOBS0001
- var: item
- loop:
- - 1
- - 2
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-loop/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-loop/tasks/main.yaml
deleted file mode 100644
index 37a29972e..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-loop/tasks/main.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- include: "{{ zj_item }}.yaml"
- loop:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
-
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-with/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-with/tasks/main.yaml
deleted file mode 100644
index e31f8e2d8..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-include-loopvar-with/tasks/main.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- include: "{{ zj_item }}.yaml"
- with_list:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-loop/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-loop/tasks/main.yaml
deleted file mode 100644
index 93cf0fca9..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-loop/tasks/main.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- debug:
- msg: "I should pass: {{ zj_item }} "
- loop:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
-
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-with/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-with/tasks/main.yaml
deleted file mode 100644
index c2198e391..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0001/valid/roles/tasks-loopvar-with/tasks/main.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- debug:
- msg: "I should pass: {{ zj_item }} "
- with_list:
- - 1
- - 2
- loop_control:
- loop_var: zj_item
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/block/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/block/tasks/main.yaml
deleted file mode 100644
index fc5d65f19..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/block/tasks/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- block:
- - synchronize:
- src: dummy
- dest: dummy
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/nested-block/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/nested-block/tasks/main.yaml
deleted file mode 100644
index bf28591b9..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/nested-block/tasks/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- block:
- - block:
- - synchronize:
- src: dummy
- dest: dummy
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/synchronize/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/synchronize/tasks/main.yaml
deleted file mode 100644
index 7a2b8091f..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/synchronize/tasks/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- synchronize:
- src: dummy
- dest: dummy
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-bz2/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-bz2/tasks/main.yaml
deleted file mode 100644
index fbd47081a..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-bz2/tasks/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- unarchive:
- src: "{{ file }}.tar.bz2"
- dest: "dummy"
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-delegated/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-delegated/tasks/main.yaml
deleted file mode 100644
index bb4379055..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-delegated/tasks/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- unarchive:
- src: "{{ file }}.tar.bz2"
- dest: "dummy"
- delegate_to: localhost
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-gz/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-gz/tasks/main.yaml
deleted file mode 100644
index 289e85675..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-gz/tasks/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- unarchive:
- src: "{{ file }}.tar.gz"
- dest: "dummy"
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-tar/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-tar/tasks/main.yaml
deleted file mode 100644
index 72759bb2e..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-tar/tasks/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- unarchive:
- src: "{{ file }}.tar"
- dest: "dummy"
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-xz/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-xz/tasks/main.yaml
deleted file mode 100644
index bc9e54a32..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-xz/tasks/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- unarchive:
- src: "{{ file }}.tar.xz"
- dest: "dummy"
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip-same-owner/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip-same-owner/tasks/main.yaml
deleted file mode 100644
index 72a08bb6b..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip-same-owner/tasks/main.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- unarchive:
- src: "{{ file }}.zip"
- dest: dummy
- extra_opts:
- - '-X'
-
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip/tasks/main.yaml
deleted file mode 100644
index 42fbeb7d1..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/faulty/roles/unarchive-zip/tasks/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- unarchive:
- src: "{{ file }}.zip"
- dest: dummy
- extra_opts:
- - '-X'
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-delegated/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-delegated/tasks/main.yaml
deleted file mode 100644
index a1abdd62b..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-delegated/tasks/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- synchronize:
- src: dummy
- dest: dummy
- delegate_to: localhost
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-no-same-owner/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-no-same-owner/tasks/main.yaml
deleted file mode 100644
index 9f0fc7671..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/synchronize-no-same-owner/tasks/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- synchronize:
- src: dummy
- dest: dummy
- owner: no
- group: no
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-no-same-owner/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-no-same-owner/tasks/main.yaml
deleted file mode 100644
index b42e89666..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-no-same-owner/tasks/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- unarchive:
- src: "{{ file }}.tar.gz"
- dest: dummy
- extra_opts:
- - '--no-same-owner'
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-remote-src/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-remote-src/tasks/main.yaml
deleted file mode 100644
index 556217250..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-remote-src/tasks/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- unarchive:
- src: "{{ file }}.tar.xz"
- dest: "dummy"
- remote_src: true
diff --git a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-unknown-file-ending/tasks/main.yaml b/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-unknown-file-ending/tasks/main.yaml
deleted file mode 100644
index f237d57d7..000000000
--- a/test-playbooks/ansible-lint-rules/ZUULJOBS0002/valid/roles/unarchive-unknown-file-ending/tasks/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- unarchive:
- src: "{{ file }}"
- dest: "dummy"
diff --git a/test-playbooks/ansible-lint-rules/ansible-lint.yaml b/test-playbooks/ansible-lint-rules/ansible-lint.yaml
deleted file mode 100644
index 958c58202..000000000
--- a/test-playbooks/ansible-lint-rules/ansible-lint.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-parseable: true
-quiet: false
-rulesdir:
- - ../../.rules/
-verbosity: 1
diff --git a/test-playbooks/ansible-lint-rules/run.yaml b/test-playbooks/ansible-lint-rules/run.yaml
deleted file mode 100644
index 9842c1da1..000000000
--- a/test-playbooks/ansible-lint-rules/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
- roles:
- - ensure-pip
- - ensure-virtualenv
- tasks:
- - name: Create tempdir for ansible-lint venv
- tempfile:
- state: directory
- register: ansible_lint_tempdir
-
- - name: Install linters-requirements.txt
- pip:
- requirements: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/linters-requirements.txt"
- virtualenv: "{{ ansible_lint_tempdir.path }}"
-
- - name: Make sure ansible-lint is installed
- command: "{{ ansible_lint_tempdir.path }}/bin/ansible-lint --version"
-
- - name: Get faulty playbooks and roles
- command: >-
- find test-playbooks/ansible-lint-rules/
- -mindepth 4
- -maxdepth 4
- -wholename '*ZUULJOBS*/faulty/*/*'
- args:
- chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
- register: faulty_ansible_items
-
- - name: Get valid playbooks and roles
- command: >-
- find test-playbooks/ansible-lint-rules/
- -mindepth 4
- -maxdepth 4
- -wholename '*ZUULJOBS*/valid/roles/*'
- args:
- chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
- register: valid_ansible_items
-
- - name: Make sure faulty roles fail linting
- command: >-
- {{ ansible_lint_tempdir.path }}/bin/ansible-lint
- -c test-playbooks/ansible-lint-rules/ansible-lint.yaml
- -t {{ item | regex_replace('.*/(ZUULJOBS.*?)/.*', '\1') }}
- {{ item }}
- args:
- chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
- register: ansible_lint
- failed_when: ansible_lint.rc == 0
- loop: "{{ faulty_ansible_items.stdout_lines }}"
-
- - name: Make sure valid roles pass linting
- command: >-
- {{ ansible_lint_tempdir.path }}/bin/ansible-lint
- -c test-playbooks/ansible-lint-rules/ansible-lint.yaml
- -t {{ item | regex_replace('.*/(ZUULJOBS.*?)/.*', '\1') }}
- {{ item }}
- args:
- chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
- register: ansible_lint
- failed_when: ansible_lint.rc != 0
- loop: "{{ valid_ansible_items.stdout_lines }}"
diff --git a/test-playbooks/python/tox.yaml b/test-playbooks/python/tox.yaml
index 34fa31e90..b6cb2a3f7 100644
--- a/test-playbooks/python/tox.yaml
+++ b/test-playbooks/python/tox.yaml
@@ -19,7 +19,6 @@
tox_envlist: docs,linters
tox_environment:
ANSIBLE_ROLES_PATH: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/roles"
- ANSIBLE_LIBRARY: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/fake-ansible"
- name: Create tempfile to verify testenvs ran
tempfile:
diff --git a/tests/fake-ansible/library/zuul_console.py b/tests/fake-ansible/library/zuul_console.py
deleted file mode 100644
index a7fc8477c..000000000
--- a/tests/fake-ansible/library/zuul_console.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is a fake zuul_return to make ansible-lint happy
-from ansible.module_utils.basic import AnsibleModule
-
-
-def main():
- return AnsibleModule()
diff --git a/tests/fake-ansible/library/zuul_return.py b/tests/fake-ansible/library/zuul_return.py
deleted file mode 100644
index 48f8c9155..000000000
--- a/tests/fake-ansible/library/zuul_return.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a fake zuul_return to make ansible-lint happy
-from ansible.module_utils.basic import AnsibleModule
-
-
-def main():
- return AnsibleModule(
- argument_spec=dict(
- data=dict(default=None),
- path=dict(default=None, type=str),
- file=dict(default=None, type=str),
- )
- )
diff --git a/tox.ini b/tox.ini
index 3a5d209b4..8d355e8ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,8 +38,9 @@ passenv =
# to export ANSIBLE_ROLES_PATH pointing to the currect repos.
# see openstack-zuul-jobs-linters job for more information.
ANSIBLE_ROLES_PATH
+ TERM
setenv =
- ANSIBLE_LIBRARY= {toxinidir}/tests/fake-ansible
+ GIT_PAGER: cat
whitelist_externals = bash
deps =
-r{toxinidir}/linters-requirements.txt
@@ -50,8 +51,6 @@ commands =
python -m ansiblelint --version
python -m ansiblelint {env:ANSIBLELINT_OPTS:--progressive}
# Ansible Syntax Check
- bash -c "find playbooks -type f -regex '.*.ya?ml' ! -regex '.*vars\/.*' -exec \
- ansible-playbook --syntax-check -i {toxinidir}/tests/inventory \{\} + > /dev/null"
{toxinidir}/tools/check_jobs_documented.py
{toxinidir}/tools/update-test-platforms.py
bash -c "(( $(find playbooks -name *.yml | wc -l) == 0)) || \{ echo 'Use .yaml'; exit 1; \}"
diff --git a/zuul-tests.d/ansible-lint-rules.yaml b/zuul-tests.d/ansible-lint-rules.yaml
deleted file mode 100644
index 0f821a235..000000000
--- a/zuul-tests.d/ansible-lint-rules.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-- job:
- name: zuul-jobs-test-ansible-lint-rules
- description: |
- Test custom ansible-lint rules in zuul-jobs
- run: test-playbooks/ansible-lint-rules/run.yaml
- files:
- - ^\.rules/.*
- - ^test-playbooks/ansible-lint-rules/.*
- - ^\.ansible-lint
-
-- project:
- check:
- jobs: &id001
- - zuul-jobs-test-ansible-lint-rules
- gate:
- jobs: *id001
- periodic-weekly:
- jobs: *id001