diff --git a/roles/ensure-package-repositories/tasks/Debian.yaml b/roles/ensure-package-repositories/tasks/Debian.yaml index 32122e878..5ce1e3b45 100644 --- a/roles/ensure-package-repositories/tasks/Debian.yaml +++ b/roles/ensure-package-repositories/tasks/Debian.yaml @@ -7,6 +7,7 @@ - name: Add apt keys become: true + # noqa args[module] We're deciding at runtime which exclusive argument to pass apt_key: url: "{{ zj_item['url'] | default(omit) }}" data: "{{ zj_item['data'] | default(omit) }}" diff --git a/test-playbooks/base-roles/fetch-subunit-output.yaml b/test-playbooks/base-roles/fetch-subunit-output.yaml index 63926cf62..57f5d3c45 100644 --- a/test-playbooks/base-roles/fetch-subunit-output.yaml +++ b/test-playbooks/base-roles/fetch-subunit-output.yaml @@ -42,7 +42,7 @@ stestr run --test-path subunit_tests {{ item.value.test_pattern }} args: chdir: "{{ item.value.directory }}" - ignore_errors: yes + failed_when: false loop: "{{ tests_data|dict2items }}" roles: - role: fetch-subunit-output diff --git a/test-playbooks/base-test-roles/fetch-subunit-output.yaml b/test-playbooks/base-test-roles/fetch-subunit-output.yaml index 63926cf62..57f5d3c45 100644 --- a/test-playbooks/base-test-roles/fetch-subunit-output.yaml +++ b/test-playbooks/base-test-roles/fetch-subunit-output.yaml @@ -42,7 +42,7 @@ stestr run --test-path subunit_tests {{ item.value.test_pattern }} args: chdir: "{{ item.value.directory }}" - ignore_errors: yes + failed_when: false loop: "{{ tests_data|dict2items }}" roles: - role: fetch-subunit-output diff --git a/test-playbooks/ensure-python-pyenv-python-version.yaml b/test-playbooks/ensure-python-pyenv-python-version.yaml index c2522a5eb..87146800e 100644 --- a/test-playbooks/ensure-python-pyenv-python-version.yaml +++ b/test-playbooks/ensure-python-pyenv-python-version.yaml @@ -3,7 +3,7 @@ - name: Create a python-version file with a python version in it delegate_to: localhost copy: - content: 3.11 + content: "3.11" dest: "{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}/.python-version" - name: Include ensure-python role diff --git a/test-playbooks/intercept-job.yaml b/test-playbooks/intercept-job.yaml index 98c56565f..8b8aaa596 100644 --- a/test-playbooks/intercept-job.yaml +++ b/test-playbooks/intercept-job.yaml @@ -14,6 +14,8 @@ poll: 0 register: touched_file - name: Set async status + # noqa args[module] see this bug + # https://github.com/ansible/ansible-lint/issues/2824 async_status: jid: "{{ keygen.ansible_job_id }}" register: keygen_check @@ -23,6 +25,8 @@ include_role: name: intercept-job - name: Set async status + # noqa args[module] see this bug + # https://github.com/ansible/ansible-lint/issues/2824 async_status: jid: "{{ touched_file.ansible_job_id }}" register: touched_file_check diff --git a/test-playbooks/python/tox.yaml b/test-playbooks/python/tox.yaml index f82e4dcdb..c7aab2e85 100644 --- a/test-playbooks/python/tox.yaml +++ b/test-playbooks/python/tox.yaml @@ -60,7 +60,7 @@ block: - name: Create tempfile to verify testenvs ran tempfile: - register: ALL_tempfile + register: all_tempfile - name: Run tox with ALL include_role: @@ -68,7 +68,7 @@ vars: zuul_work_dir: "{{ zuul.project.src_dir }}/test-playbooks/python/" tox_install_siblings: false - tox_extra_args: "-- {{ ALL_tempfile.path }}" + tox_extra_args: "-- {{ all_tempfile.path }}" tox_envlist: 'ALL' always: - name: Make sure magic lines are present @@ -76,11 +76,11 @@ - linters - non-default lineinfile: - path: "{{ ALL_tempfile.path }}" + path: "{{ all_tempfile.path }}" line: "{{ item }}" check_mode: true - register: ALL_status - failed_when: ALL_status is changed + register: all_status + failed_when: all_status is changed - name: Move test-playbooks/python/tox.ini to test-playbooks/python/foo.ini # Tox 4 appears to have trouble when there is a tox.ini in the current diff --git a/test-playbooks/registry/buildset-registry-k8s-crio-post.yaml b/test-playbooks/registry/buildset-registry-k8s-crio-post.yaml index 6bfd989fa..2375d53b9 100644 --- a/test-playbooks/registry/buildset-registry-k8s-crio-post.yaml +++ b/test-playbooks/registry/buildset-registry-k8s-crio-post.yaml @@ -13,7 +13,7 @@ failed_when: no - name: Describe dockertest pod command: kubectl describe pod/quaytest - ignore_errors: true + failed_when: false - name: Describe upstream-dockertest pod command: kubectl describe pod/upstream-dockertest - ignore_errors: true + failed_when: false