From 509880073ed75fbd3eadb208b16c64229568347b Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 9 Feb 2024 11:25:20 -0800 Subject: [PATCH] Remove command.warn usage This is no longer present in Ansible 9. Removing these upsets ansible-lint, so those errors are ignored. The base roles job has bitrotted on centos-7 and bionic due to a bad voluptuous release used in an stestr test. That is fixed in this change as well. Change-Id: I67886d5ad82ab590979f82bd102d6f974b9d4421 --- roles/configure-mirrors/handlers/main.yaml | 2 -- roles/ensure-docker/tasks/main.yaml | 2 -- roles/fetch-sphinx-tarball/tasks/html.yaml | 2 -- test-playbooks/base-roles/fetch-subunit-output.yaml | 1 + test-playbooks/dhall/test-dhall-diff.yaml | 1 - test-playbooks/dstat-graph.yaml | 2 -- test-playbooks/haskell/setup-stack-project.yaml | 2 -- test-playbooks/javascripts/fetch-javascript-tarball.yaml | 2 -- test-playbooks/python/fetch-sphinx-output.yaml | 2 -- test-playbooks/python/fetch-sphinx-tarball.yaml | 2 -- test-playbooks/registry/test-registry.yaml | 2 -- test-playbooks/upload-git-mirror.yaml | 2 -- tox.ini | 2 +- 13 files changed, 2 insertions(+), 22 deletions(-) diff --git a/roles/configure-mirrors/handlers/main.yaml b/roles/configure-mirrors/handlers/main.yaml index e2da4eea1..b3da81c3d 100644 --- a/roles/configure-mirrors/handlers/main.yaml +++ b/roles/configure-mirrors/handlers/main.yaml @@ -10,8 +10,6 @@ - name: Update yum/dnf cache become: yes command: "{{ zj_command }}" - args: - warn: false with_items: - "{{ ansible_pkg_mgr }} clean all" # verbose is needed in order to make it possible to debug potential failures diff --git a/roles/ensure-docker/tasks/main.yaml b/roles/ensure-docker/tasks/main.yaml index 0c1024558..43de9f7b5 100644 --- a/roles/ensure-docker/tasks/main.yaml +++ b/roles/ensure-docker/tasks/main.yaml @@ -73,8 +73,6 @@ - name: Validate ability to talk with docker command: docker ps changed_when: false - args: - warn: no - name: Get version details command: docker version diff --git a/roles/fetch-sphinx-tarball/tasks/html.yaml b/roles/fetch-sphinx-tarball/tasks/html.yaml index 11400ea74..a6b40feba 100644 --- a/roles/fetch-sphinx-tarball/tasks/html.yaml +++ b/roles/fetch-sphinx-tarball/tasks/html.yaml @@ -6,8 +6,6 @@ - name: Archive HTML command: "tar -f {{ html_archive.path }} -C {{ zuul_work_dir }}/{{ sphinx_build_dir }}/html --exclude=.doctrees -cz ." - args: - warn: false - name: Fetch HTML when: not zuul_use_fetch_output diff --git a/test-playbooks/base-roles/fetch-subunit-output.yaml b/test-playbooks/base-roles/fetch-subunit-output.yaml index 162ac9bc7..63926cf62 100644 --- a/test-playbooks/base-roles/fetch-subunit-output.yaml +++ b/test-playbooks/base-roles/fetch-subunit-output.yaml @@ -19,6 +19,7 @@ name: - stestr - python-subunit + - 'voluptuous==0.13.1' virtualenv: "{{ zuul_work_dir }}/.tox/utests/" virtualenv_command: '{{ ensure_pip_virtualenv_command }}' diff --git a/test-playbooks/dhall/test-dhall-diff.yaml b/test-playbooks/dhall/test-dhall-diff.yaml index b52b04382..dfef22046 100644 --- a/test-playbooks/dhall/test-dhall-diff.yaml +++ b/test-playbooks/dhall/test-dhall-diff.yaml @@ -18,7 +18,6 @@ command: git commit -a -m "test update" args: chdir: "{{ zuul.project.src_dir }}" - warn: false - name: Failed dhall-diff include_role: diff --git a/test-playbooks/dstat-graph.yaml b/test-playbooks/dstat-graph.yaml index 1184987ce..71a03ed7e 100644 --- a/test-playbooks/dstat-graph.yaml +++ b/test-playbooks/dstat-graph.yaml @@ -11,8 +11,6 @@ # Not using ansible pause module on purpose in order to simulate the load - name: Simulate workload command: sleep 10 - args: - warn: false - hosts: all roles: diff --git a/test-playbooks/haskell/setup-stack-project.yaml b/test-playbooks/haskell/setup-stack-project.yaml index f301c74b7..d9fb288a7 100644 --- a/test-playbooks/haskell/setup-stack-project.yaml +++ b/test-playbooks/haskell/setup-stack-project.yaml @@ -5,5 +5,3 @@ - name: Copy file over zuul-jobs command: rsync -a new-project/ "{{ zuul.project.src_dir }}/" - args: - warn: false diff --git a/test-playbooks/javascripts/fetch-javascript-tarball.yaml b/test-playbooks/javascripts/fetch-javascript-tarball.yaml index 1f1970b38..a45d0719c 100644 --- a/test-playbooks/javascripts/fetch-javascript-tarball.yaml +++ b/test-playbooks/javascripts/fetch-javascript-tarball.yaml @@ -4,8 +4,6 @@ shell: | mkdir -p {{ zuul.project.src_dir }} tar czf {{ zuul.project.src_dir }}/dist.tgz /etc/os-release - args: - warn: false tasks: - name: Run fetch-javascript-tarball import_role: diff --git a/test-playbooks/python/fetch-sphinx-output.yaml b/test-playbooks/python/fetch-sphinx-output.yaml index 00fd37f69..0a6df7ca7 100644 --- a/test-playbooks/python/fetch-sphinx-output.yaml +++ b/test-playbooks/python/fetch-sphinx-output.yaml @@ -9,8 +9,6 @@ shell: | mkdir -p {{ zuul.project.src_dir }}/doc/build/html echo "Hello" > {{ zuul.project.src_dir }}/doc/build/html/index.html - args: - warn: false tasks: - name: Run fetch-sphinx-output diff --git a/test-playbooks/python/fetch-sphinx-tarball.yaml b/test-playbooks/python/fetch-sphinx-tarball.yaml index 58a290c23..feee3fd4f 100644 --- a/test-playbooks/python/fetch-sphinx-tarball.yaml +++ b/test-playbooks/python/fetch-sphinx-tarball.yaml @@ -14,8 +14,6 @@ mkdir -p {{ zuul.project.src_dir }}/doc/build/html echo "%PDF-1.2" > {{ zuul.project.src_dir }}/doc/build/pdf/doc-{{ zuul.project.short_name }}.pdf echo "Hello" > {{ zuul.project.src_dir }}/doc/build/html/index.html - args: - warn: false tasks: # This tars up the fake sphinx output we created above on the test diff --git a/test-playbooks/registry/test-registry.yaml b/test-playbooks/registry/test-registry.yaml index fca0db385..f85a4badc 100644 --- a/test-playbooks/registry/test-registry.yaml +++ b/test-playbooks/registry/test-registry.yaml @@ -134,8 +134,6 @@ mkdir -p src/openstack.org/project/fake-sibling && touch src/opendev.org/project/fake-sibling/file && touch src/openstack.org/project/fake-sibling/file - args: - warn: false - name: Build docker image include_role: diff --git a/test-playbooks/upload-git-mirror.yaml b/test-playbooks/upload-git-mirror.yaml index 4a19dd3de..69773970b 100644 --- a/test-playbooks/upload-git-mirror.yaml +++ b/test-playbooks/upload-git-mirror.yaml @@ -38,7 +38,6 @@ changed_when: false args: chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" - warn: false register: current_commit - name: Clone upstream zuul-jobs as a bare repository @@ -71,7 +70,6 @@ changed_when: false args: chdir: "{{ test_repo_path }}" - warn: false register: after_mirror - name: Assert that the git repositories have the same commit for HEAD diff --git a/tox.ini b/tox.ini index c67abc8bf..289695bd9 100644 --- a/tox.ini +++ b/tox.ini @@ -55,7 +55,7 @@ commands = flake8 {posargs} yamllint -s -f parsable . python -m ansiblelint --version - python -m ansiblelint {env:ANSIBLELINT_OPTS:} + python -m ansiblelint {env:ANSIBLELINT_OPTS:-x command-instead-of-module,deprecated-command-syntax,no-handler} # Ansible Syntax Check {toxinidir}/tools/check_jobs_documented.py {toxinidir}/tools/update-test-platforms.py