From 2db422f0b857d4b9f28161c4721792ebb0e34187 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 21 Aug 2024 12:24:57 -0700 Subject: [PATCH] Run ansible-lint on Ubuntu Noble We ran into issues getting ansible-lint to run on Noble without updating everything to current ish versions due to Python 3.12 compatibility issues. Updating everything in this way created a bunch of new lint errors we need to fix so we worked around the problem previously by pinning back to Jammy. Now we move the job back to Noble (the default Nodeset) and update the tooling and fix the linter errors. This should allow us to move forward in a productive manner on modern platforms. The linter errors we fix include: * Naming every play * Ensuring every play name starts with a capital letter * Using fully qualified collection names for action modules (archive, git_config, and synchronize) * Quoting octal file modes Change-Id: I96560c5ce2a5af39d39b3fc339862932a856bd13 --- playbooks/api-jobs/promote.yaml | 3 ++- playbooks/bindep-fallback/run.yaml | 3 ++- playbooks/check-main-yaml/post.yaml | 3 ++- playbooks/check-main-yaml/pre.yaml | 3 ++- playbooks/check-release-approval/run.yaml | 3 ++- playbooks/javascript/content.yaml | 3 ++- playbooks/javascript/post-stackviz.yaml | 5 +++-- playbooks/javascript/pre.yaml | 3 ++- playbooks/javascript/publish.yaml | 3 ++- playbooks/javascript/release.yaml | 8 +++++--- playbooks/javascript/tarball.yaml | 3 ++- playbooks/maintain-github-mirror/run.yaml | 3 ++- playbooks/openstack-fips/pre.yaml | 4 ++-- playbooks/project-config/post-tox.yaml | 3 ++- playbooks/project-config/pre-tox.yaml | 3 ++- playbooks/project-config/run-tox.yaml | 3 ++- playbooks/proposal/pre.yaml | 5 +++-- playbooks/proposal/propose-project-config-update.yaml | 3 ++- playbooks/proposal/propose-update-constraints.yaml | 3 ++- playbooks/proposal/propose-updates.yaml | 3 ++- playbooks/pti-python-tarball/check.yaml | 3 ++- playbooks/pti-python-tarball/post.yaml | 8 +++++--- playbooks/pti-python-tarball/pre.yaml | 3 ++- playbooks/pti-python-tarball/run.yaml | 3 ++- playbooks/publications-index/run.yaml | 3 ++- playbooks/publications/run.yaml | 3 ++- playbooks/publish/install-guide.yaml | 6 ++++-- playbooks/publish/openstack-afs.yaml | 3 ++- playbooks/publish/openstack-artifacts.yaml | 5 +++-- playbooks/publish/publications-index.yaml | 3 ++- playbooks/publish/publications.yaml | 3 ++- playbooks/publish/puppetforge.yaml | 3 ++- playbooks/publish/pypi.yaml | 3 ++- playbooks/publish/releasenotes.yaml | 3 ++- playbooks/publish/releases-afs.yaml | 3 ++- playbooks/publish/starlingx-afs.yaml | 3 ++- playbooks/publish/trigger-rtd.yaml | 3 ++- playbooks/publish/wheel-mirror.yaml | 3 ++- playbooks/puppet-tarball/post.yaml | 6 ++++-- playbooks/puppet-tarball/pre.yaml | 3 ++- playbooks/puppet-tarball/run.yaml | 3 ++- playbooks/python-branch-tarball/post.yaml | 3 ++- playbooks/release/launchpad.yaml | 3 ++- playbooks/release/post.yaml | 3 ++- playbooks/release/pre.yaml | 3 ++- playbooks/release/tag.yaml | 3 ++- playbooks/releasenotes/pre.yaml | 3 ++- playbooks/releasenotes/run.yaml | 3 ++- playbooks/service-types/promote.yaml | 3 ++- playbooks/sphinx/neutron-horizon-hack.yaml | 3 ++- playbooks/sphinx/post-infra.yaml | 3 ++- playbooks/sphinx/post.yaml | 3 ++- playbooks/sphinx/pre.yaml | 3 ++- playbooks/sphinx/run.yaml | 3 ++- .../translation/openstack-translation-artifacts.yaml | 5 +++-- playbooks/translation/post.yaml | 3 ++- playbooks/translation/pre.yaml | 3 ++- playbooks/translation/propose-translation-update.yaml | 3 ++- playbooks/translation/upstream-translation-update.yaml | 6 ++++-- playbooks/wheel/release.yaml | 3 ++- roles/configure-git/tasks/main.yaml | 2 +- roles/copy-proposal-common-scripts/tasks/main.yaml | 2 +- roles/copy-release-tools-scripts/tasks/main.yaml | 2 +- .../fetch-translations-subunit-output/tasks/main.yaml | 2 +- roles/test-upload-logs/tasks/main.yaml | 10 +++++----- tox.ini | 6 ++---- zuul.d/projects.yaml | 6 ++---- 67 files changed, 149 insertions(+), 89 deletions(-) diff --git a/playbooks/api-jobs/promote.yaml b/playbooks/api-jobs/promote.yaml index 7ebc9b13ce..ad74cc637e 100644 --- a/playbooks/api-jobs/promote.yaml +++ b/playbooks/api-jobs/promote.yaml @@ -1,6 +1,7 @@ # This is a variant of https://opendev.org/opendev/base-jobs/src/branch/master/playbooks/docs/promote.yaml # updated to calculate the service type. -- hosts: localhost +- name: Promote API Documentation + hosts: localhost tasks: - name: Check execution context when: "zuul.branch is not defined" diff --git a/playbooks/bindep-fallback/run.yaml b/playbooks/bindep-fallback/run.yaml index 0aa770a430..f7d026c067 100644 --- a/playbooks/bindep-fallback/run.yaml +++ b/playbooks/bindep-fallback/run.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Run Bindep Against Fallback File + hosts: all roles: - role: bindep bindep_profile: test diff --git a/playbooks/check-main-yaml/post.yaml b/playbooks/check-main-yaml/post.yaml index e9eeeca48c..1d34613ebf 100644 --- a/playbooks/check-main-yaml/post.yaml +++ b/playbooks/check-main-yaml/post.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Post Run For Zuul main.yaml Checks + hosts: all roles: - fetch-tox-output diff --git a/playbooks/check-main-yaml/pre.yaml b/playbooks/check-main-yaml/pre.yaml index c4968c63f9..4893a3517b 100644 --- a/playbooks/check-main-yaml/pre.yaml +++ b/playbooks/check-main-yaml/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Pre Run for Zuul main.yaml Checks + hosts: all roles: - ensure-tox - revoke-sudo diff --git a/playbooks/check-release-approval/run.yaml b/playbooks/check-release-approval/run.yaml index 72b606e4f4..046d4ff5ff 100644 --- a/playbooks/check-release-approval/run.yaml +++ b/playbooks/check-release-approval/run.yaml @@ -1,4 +1,5 @@ -- hosts: localhost +- name: Check Release Approvals + hosts: localhost roles: - role: check-release-approval change: "{{ zuul.change }}" diff --git a/playbooks/javascript/content.yaml b/playbooks/javascript/content.yaml index bfe5f4811a..59f64e4ded 100644 --- a/playbooks/javascript/content.yaml +++ b/playbooks/javascript/content.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Run NPM + hosts: all roles: - role: npm diff --git a/playbooks/javascript/post-stackviz.yaml b/playbooks/javascript/post-stackviz.yaml index 9c6c58d5fe..770e4e31dd 100644 --- a/playbooks/javascript/post-stackviz.yaml +++ b/playbooks/javascript/post-stackviz.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Process Stackviz Artifacts + hosts: all tasks: - name: Rename tarball and move it to a subdir named dist as well @@ -19,7 +20,7 @@ delegate_to: localhost - name: Collect artifacts - synchronize: + ansible.posix.synchronize: dest: "{{ zuul.executor.work_root }}/artifacts/" mode: pull src: "{{ zuul.project.src_dir }}/dist/" diff --git a/playbooks/javascript/pre.yaml b/playbooks/javascript/pre.yaml index 8461e06b53..968d8c2f65 100644 --- a/playbooks/javascript/pre.yaml +++ b/playbooks/javascript/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare a Javascript Dev Env + hosts: all roles: - bindep - test-setup diff --git a/playbooks/javascript/publish.yaml b/playbooks/javascript/publish.yaml index 7a1b0c3891..0481a6868d 100644 --- a/playbooks/javascript/publish.yaml +++ b/playbooks/javascript/publish.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Javascript Artifacts for Publication + hosts: all roles: - fetch-javascript-output - fetch-javascript-content-tarball diff --git a/playbooks/javascript/release.yaml b/playbooks/javascript/release.yaml index 4c275da46d..4099b224bd 100644 --- a/playbooks/javascript/release.yaml +++ b/playbooks/javascript/release.yaml @@ -1,18 +1,20 @@ -- hosts: all +- name: Fetch Javascript Artifacts for Publication + hosts: all roles: - fetch-javascript-output - version-from-git - fetch-javascript-tarball -- hosts: all +- name: Publish Javascript Artifacts to NPM + hosts: all tasks: # project_ver is set by set_fact in version-from-git, but that runs on # the remote host, which puts the fact into the hostvars of that host. # Now that we're running on localhost, we need to reach in to the remote # hosts vars to get the value. - name: Upload to NPM + delegate_to: localhost block: - name: Upload to npm include_role: name: upload-npm - delegate_to: localhost diff --git a/playbooks/javascript/tarball.yaml b/playbooks/javascript/tarball.yaml index 79c3f872db..4a71135332 100644 --- a/playbooks/javascript/tarball.yaml +++ b/playbooks/javascript/tarball.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Run npm pack + hosts: all roles: - role: npm npm_command: pack diff --git a/playbooks/maintain-github-mirror/run.yaml b/playbooks/maintain-github-mirror/run.yaml index 56ca6321b1..7504e0aa9e 100644 --- a/playbooks/maintain-github-mirror/run.yaml +++ b/playbooks/maintain-github-mirror/run.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Run GitHub Mirror Script + hosts: all tasks: - name: Ensure pip include_role: diff --git a/playbooks/openstack-fips/pre.yaml b/playbooks/openstack-fips/pre.yaml index f7fb163811..d01636efca 100644 --- a/playbooks/openstack-fips/pre.yaml +++ b/playbooks/openstack-fips/pre.yaml @@ -1,7 +1,7 @@ -- name: enable ua subscription +- name: Enable ua subscription hosts: all tasks: - - name: enable ua subscription for fips + - name: Enable ua subscription for fips include_role: name: enable-ua-subscription when: enable_fips | default(false) diff --git a/playbooks/project-config/post-tox.yaml b/playbooks/project-config/post-tox.yaml index e9eeeca48c..07197ae763 100644 --- a/playbooks/project-config/post-tox.yaml +++ b/playbooks/project-config/post-tox.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Fetch Tox Output + hosts: all roles: - fetch-tox-output diff --git a/playbooks/project-config/pre-tox.yaml b/playbooks/project-config/pre-tox.yaml index e233e74c33..ddaa61a685 100644 --- a/playbooks/project-config/pre-tox.yaml +++ b/playbooks/project-config/pre-tox.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare a Tox Runtime Environment + hosts: all roles: - bindep - ensure-tox diff --git a/playbooks/project-config/run-tox.yaml b/playbooks/project-config/run-tox.yaml index 22f82096c7..c1293daa61 100644 --- a/playbooks/project-config/run-tox.yaml +++ b/playbooks/project-config/run-tox.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Run Tox + hosts: all roles: - tox diff --git a/playbooks/proposal/pre.yaml b/playbooks/proposal/pre.yaml index 01cf995463..0afe2456ee 100644 --- a/playbooks/proposal/pre.yaml +++ b/playbooks/proposal/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare a Code Proposal Environment + hosts: all pre_tasks: - name: Ensure pip include_role: @@ -24,7 +25,7 @@ copy: dest: '{{ ansible_user_dir }}/scripts/' src: '{{ item }}' - mode: 0755 + mode: '0755' with_items: - generate_puppetfile.sh - propose_update.sh diff --git a/playbooks/proposal/propose-project-config-update.yaml b/playbooks/proposal/propose-project-config-update.yaml index e82ea8700d..018a21c702 100644 --- a/playbooks/proposal/propose-project-config-update.yaml +++ b/playbooks/proposal/propose-project-config-update.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Propose Constraints Update + hosts: all tasks: - name: Propose constraints update diff --git a/playbooks/proposal/propose-update-constraints.yaml b/playbooks/proposal/propose-update-constraints.yaml index 9642042163..8272e22ef8 100644 --- a/playbooks/proposal/propose-update-constraints.yaml +++ b/playbooks/proposal/propose-update-constraints.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Propose Constraints Update + hosts: all tasks: - name: Pause in order to allow pypi to catch up ansible.builtin.pause: diff --git a/playbooks/proposal/propose-updates.yaml b/playbooks/proposal/propose-updates.yaml index 0ee0e98eb3..067ae657fd 100644 --- a/playbooks/proposal/propose-updates.yaml +++ b/playbooks/proposal/propose-updates.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Run propose_update.sh Script + hosts: all tasks: - name: Run propose_update.sh script diff --git a/playbooks/pti-python-tarball/check.yaml b/playbooks/pti-python-tarball/check.yaml index 49e7e00daa..134dde33bf 100644 --- a/playbooks/pti-python-tarball/check.yaml +++ b/playbooks/pti-python-tarball/check.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Run Twine Checks Against Sdist Tarball + hosts: all roles: - build-python-release - ensure-twine diff --git a/playbooks/pti-python-tarball/post.yaml b/playbooks/pti-python-tarball/post.yaml index cf322f38f0..b261b82df0 100644 --- a/playbooks/pti-python-tarball/post.yaml +++ b/playbooks/pti-python-tarball/post.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Collect Artifacts + hosts: all post_tasks: - name: Find tarballs and wheels in dist folder. @@ -20,13 +21,14 @@ delegate_to: localhost - name: Collect tarball artifacts. - synchronize: + ansible.posix.synchronize: dest: "{{ zuul.executor.work_root }}/artifacts/" mode: pull src: "{{ item.path }}" verify_host: true with_items: "{{ result.files }}" -- hosts: localhost +- name: Sign Artifacts + hosts: localhost roles: - sign-artifacts diff --git a/playbooks/pti-python-tarball/pre.yaml b/playbooks/pti-python-tarball/pre.yaml index 5a3f34dec7..e566023a86 100644 --- a/playbooks/pti-python-tarball/pre.yaml +++ b/playbooks/pti-python-tarball/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare Python Package Build Environment + hosts: all roles: # We use ensure-pip to make sure the wheel module is installed - ensure-pip diff --git a/playbooks/pti-python-tarball/run.yaml b/playbooks/pti-python-tarball/run.yaml index 3ea4aef6fa..835bac47c9 100644 --- a/playbooks/pti-python-tarball/run.yaml +++ b/playbooks/pti-python-tarball/run.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Build Python Release + hosts: all roles: - build-python-release diff --git a/playbooks/publications-index/run.yaml b/playbooks/publications-index/run.yaml index 08357fe13c..b89e01abf7 100644 --- a/playbooks/publications-index/run.yaml +++ b/playbooks/publications-index/run.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Run make-index + hosts: all tasks: - name: Run make-index command: ./make-index diff --git a/playbooks/publications/run.yaml b/playbooks/publications/run.yaml index 05f6e21503..1a0775ed9c 100644 --- a/playbooks/publications/run.yaml +++ b/playbooks/publications/run.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare for Publication + hosts: all roles: - role: write-root-marker root_marker_dir: "{{ zuul.project.src_dir }}/" diff --git a/playbooks/publish/install-guide.yaml b/playbooks/publish/install-guide.yaml index 2f58ab6509..49cdf2b424 100644 --- a/playbooks/publish/install-guide.yaml +++ b/playbooks/publish/install-guide.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Sphinx Output + hosts: all roles: - role: prepare-docs-for-afs when: zuul_success | bool @@ -7,7 +8,8 @@ zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts" when: zuul_success | bool -- hosts: localhost +- name: Publish Sphinx Output to AFS + hosts: localhost roles: - role: set-service-type-data-fact when: zuul_success | bool diff --git a/playbooks/publish/openstack-afs.yaml b/playbooks/publish/openstack-afs.yaml index 399f8012d1..72ae88bd11 100644 --- a/playbooks/publish/openstack-afs.yaml +++ b/playbooks/publish/openstack-afs.yaml @@ -1,4 +1,5 @@ -- hosts: localhost +- name: Update to AFS + hosts: localhost pre_tasks: # Note that "{{ afs.path }}" is a valid afs_target and thus # afs_subpath can be empty, we need this for openstack-manuals diff --git a/playbooks/publish/openstack-artifacts.yaml b/playbooks/publish/openstack-artifacts.yaml index 105c724f3e..ac9a91d286 100644 --- a/playbooks/publish/openstack-artifacts.yaml +++ b/playbooks/publish/openstack-artifacts.yaml @@ -1,6 +1,8 @@ -- hosts: localhost +- name: Publish Artifacts to AFS + hosts: localhost tasks: - name: Upload to AFS + when: zuul_success | bool block: - name: Create AFS token include_role: @@ -14,4 +16,3 @@ - name: Destroy AFS token include_role: name: destroy-afs-token - when: zuul_success | bool diff --git a/playbooks/publish/publications-index.yaml b/playbooks/publish/publications-index.yaml index a43126aefe..467f42b559 100644 --- a/playbooks/publish/publications-index.yaml +++ b/playbooks/publish/publications-index.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Sphinx Output + hosts: all roles: - fetch-tox-output - role: write-root-marker diff --git a/playbooks/publish/publications.yaml b/playbooks/publish/publications.yaml index e89517d7b1..61183f9df5 100644 --- a/playbooks/publish/publications.yaml +++ b/playbooks/publish/publications.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Sphinx Output + hosts: all roles: - role: fetch-sphinx-output sphinx_output_src: "{{ zuul.project.src_dir }}/_out/" diff --git a/playbooks/publish/puppetforge.yaml b/playbooks/publish/puppetforge.yaml index 48b5bf634a..3fad0c259c 100644 --- a/playbooks/publish/puppetforge.yaml +++ b/playbooks/publish/puppetforge.yaml @@ -1,4 +1,5 @@ -- hosts: localhost +- name: Publish Puppet Modules to PuppetForge + hosts: localhost tasks: - name: Find all puppet tarballs in artifacts find: diff --git a/playbooks/publish/pypi.yaml b/playbooks/publish/pypi.yaml index 6f60445bb6..74b7ac2cbb 100644 --- a/playbooks/publish/pypi.yaml +++ b/playbooks/publish/pypi.yaml @@ -1,4 +1,5 @@ -- hosts: localhost +- name: Publish Python Package to PyPI + hosts: localhost roles: - role: ensure-twine when: zuul_success | bool diff --git a/playbooks/publish/releasenotes.yaml b/playbooks/publish/releasenotes.yaml index eaff94ddb1..b122513dba 100644 --- a/playbooks/publish/releasenotes.yaml +++ b/playbooks/publish/releasenotes.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Release Notes + hosts: all roles: - role: write-root-marker root_marker_dir: "{{ zuul_work_dir }}/{{ sphinx_build_dir }}/html" diff --git a/playbooks/publish/releases-afs.yaml b/playbooks/publish/releases-afs.yaml index b2146fc6c0..46597086a4 100644 --- a/playbooks/publish/releases-afs.yaml +++ b/playbooks/publish/releases-afs.yaml @@ -1,4 +1,5 @@ -- hosts: localhost +- name: Publish Release to AFS + hosts: localhost roles: - role: create-afs-token when: zuul_success | bool diff --git a/playbooks/publish/starlingx-afs.yaml b/playbooks/publish/starlingx-afs.yaml index 04ed2dd1bf..fac1ed7478 100644 --- a/playbooks/publish/starlingx-afs.yaml +++ b/playbooks/publish/starlingx-afs.yaml @@ -1,4 +1,5 @@ -- hosts: localhost +- name: Publish StarlingX Web Content + hosts: localhost roles: - role: create-afs-token when: zuul_success | bool diff --git a/playbooks/publish/trigger-rtd.yaml b/playbooks/publish/trigger-rtd.yaml index 26505c8ccc..c3ccc82c80 100644 --- a/playbooks/publish/trigger-rtd.yaml +++ b/playbooks/publish/trigger-rtd.yaml @@ -1,3 +1,4 @@ -- hosts: localhost +- name: Trigger Read The Docs Build + hosts: localhost roles: - trigger-readthedocs diff --git a/playbooks/publish/wheel-mirror.yaml b/playbooks/publish/wheel-mirror.yaml index f60da83fb8..5c92c5c4ad 100644 --- a/playbooks/publish/wheel-mirror.yaml +++ b/playbooks/publish/wheel-mirror.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Publish Wheels to Mirror + hosts: all # We don't want the python2 & python3 hosts copying to AFS at the # same time. In some cases for generic wheels they can have # produced a file with the same name and thus we open a window to diff --git a/playbooks/puppet-tarball/post.yaml b/playbooks/puppet-tarball/post.yaml index 87e91db35f..32e81ae25d 100644 --- a/playbooks/puppet-tarball/post.yaml +++ b/playbooks/puppet-tarball/post.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Puppet Module + hosts: all roles: - fetch-puppet-module-output @@ -10,6 +11,7 @@ args: chdir: "{{ zuul.project.src_dir }}/pkg" -- hosts: localhost +- name: Sign Artifacts + hosts: localhost roles: - sign-artifacts diff --git a/playbooks/puppet-tarball/pre.yaml b/playbooks/puppet-tarball/pre.yaml index 0eee53bc76..a00952c6aa 100644 --- a/playbooks/puppet-tarball/pre.yaml +++ b/playbooks/puppet-tarball/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Setup Puppet Module Build Environment + hosts: all roles: - ensure-pdk-dependencies - revoke-sudo diff --git a/playbooks/puppet-tarball/run.yaml b/playbooks/puppet-tarball/run.yaml index 817b8ad245..3268e00243 100644 --- a/playbooks/puppet-tarball/run.yaml +++ b/playbooks/puppet-tarball/run.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Build Puppet Module + hosts: all roles: - build-puppet-module diff --git a/playbooks/python-branch-tarball/post.yaml b/playbooks/python-branch-tarball/post.yaml index a175d6405b..3be9233c2b 100644 --- a/playbooks/python-branch-tarball/post.yaml +++ b/playbooks/python-branch-tarball/post.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Create Branch Specific Python Tarball + hosts: all roles: - fetch-python-sdist-output diff --git a/playbooks/release/launchpad.yaml b/playbooks/release/launchpad.yaml index ae7fcff391..06fe8f1683 100644 --- a/playbooks/release/launchpad.yaml +++ b/playbooks/release/launchpad.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Add Launchpad Credentials + hosts: all roles: - add-launchpad-credentials diff --git a/playbooks/release/post.yaml b/playbooks/release/post.yaml index 87f74fb639..b27ef741f3 100644 --- a/playbooks/release/post.yaml +++ b/playbooks/release/post.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Cleanup Credentials + hosts: all roles: - remove-sshkey - remove-launchpad-credentials diff --git a/playbooks/release/pre.yaml b/playbooks/release/pre.yaml index 6bde408017..949d4c711c 100644 --- a/playbooks/release/pre.yaml +++ b/playbooks/release/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare Release Environment + hosts: all pre_tasks: # This is tempoarary until v2 is gone and we can rework things - name: Update origin remote to enable notes fetching diff --git a/playbooks/release/tag.yaml b/playbooks/release/tag.yaml index b8cb8b3bbc..432978a931 100644 --- a/playbooks/release/tag.yaml +++ b/playbooks/release/tag.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Tag and Push Release + hosts: all tasks: - name: Run release scripts shell: diff --git a/playbooks/releasenotes/pre.yaml b/playbooks/releasenotes/pre.yaml index be5b39edc1..8cf085b0f1 100644 --- a/playbooks/releasenotes/pre.yaml +++ b/playbooks/releasenotes/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare Reno Build Environment + hosts: all roles: - role: bindep bindep_profile: doc diff --git a/playbooks/releasenotes/run.yaml b/playbooks/releasenotes/run.yaml index 17d9a3111b..c00f6e80af 100644 --- a/playbooks/releasenotes/run.yaml +++ b/playbooks/releasenotes/run.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Build Releasenotes + hosts: all roles: - role: ensure-if-python # Releasenotes do not need the package itself to be installed diff --git a/playbooks/service-types/promote.yaml b/playbooks/service-types/promote.yaml index 6725ee9f9c..8a00a712b1 100644 --- a/playbooks/service-types/promote.yaml +++ b/playbooks/service-types/promote.yaml @@ -2,7 +2,8 @@ # It uses upload-afs-syncronize instead of upload-afs-roots to add content # but not delete. It is also simplified for repository # openstack/service-types-authority. -- hosts: localhost +- name: Upload Service Types to AFS + hosts: localhost tasks: - name: Check execution context when: "zuul.branch is not defined" diff --git a/playbooks/sphinx/neutron-horizon-hack.yaml b/playbooks/sphinx/neutron-horizon-hack.yaml index da220726d0..6263292436 100644 --- a/playbooks/sphinx/neutron-horizon-hack.yaml +++ b/playbooks/sphinx/neutron-horizon-hack.yaml @@ -1,4 +1,5 @@ # TODO(mordred) ZOMG DELETE THIS -- hosts: all +- name: Run Neutron Horizon Hack + hosts: all roles: - neutron-horizon-hack diff --git a/playbooks/sphinx/post-infra.yaml b/playbooks/sphinx/post-infra.yaml index 5879ccb108..cb19573283 100644 --- a/playbooks/sphinx/post-infra.yaml +++ b/playbooks/sphinx/post-infra.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Infra Sphinx Docs + hosts: all roles: - role: prepare-infra-docs-for-afs when: zuul_success | bool diff --git a/playbooks/sphinx/post.yaml b/playbooks/sphinx/post.yaml index 9d32fdf4b6..49a775fa0b 100644 --- a/playbooks/sphinx/post.yaml +++ b/playbooks/sphinx/post.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Fetch Sphinx Docs + hosts: all roles: - role: prepare-docs-for-afs when: zuul_success | bool diff --git a/playbooks/sphinx/pre.yaml b/playbooks/sphinx/pre.yaml index 4f9e210e8e..1b08f78832 100644 --- a/playbooks/sphinx/pre.yaml +++ b/playbooks/sphinx/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare Sphinx Build Environment + hosts: all roles: - role: bindep bindep_profile: compile doc diff --git a/playbooks/sphinx/run.yaml b/playbooks/sphinx/run.yaml index 1588e9df39..51b59346ec 100644 --- a/playbooks/sphinx/run.yaml +++ b/playbooks/sphinx/run.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Build Sphinx Docs + hosts: all roles: - ensure-if-python - sphinx diff --git a/playbooks/translation/openstack-translation-artifacts.yaml b/playbooks/translation/openstack-translation-artifacts.yaml index 8bcfa18743..ede52ebe87 100644 --- a/playbooks/translation/openstack-translation-artifacts.yaml +++ b/playbooks/translation/openstack-translation-artifacts.yaml @@ -1,6 +1,8 @@ -- hosts: localhost +- name: Upload to AFS + hosts: localhost tasks: - name: Upload to AFS + when: zuul_success | bool block: - name: Create AFS token include_role: @@ -14,4 +16,3 @@ - name: Destroy AFS token include_role: name: destroy-afs-token - when: zuul_success | bool diff --git a/playbooks/translation/post.yaml b/playbooks/translation/post.yaml index edb81edc8e..b7080f4bf8 100644 --- a/playbooks/translation/post.yaml +++ b/playbooks/translation/post.yaml @@ -1,3 +1,4 @@ -- hosts: all +- name: Fetch Translation Subunit Output + hosts: all roles: - fetch-translations-subunit-output diff --git a/playbooks/translation/pre.yaml b/playbooks/translation/pre.yaml index a926b608b1..049a80bb79 100644 --- a/playbooks/translation/pre.yaml +++ b/playbooks/translation/pre.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Prepare Translations Processing Environment + hosts: all roles: - role: ensure-sphinx doc_building_packages: diff --git a/playbooks/translation/propose-translation-update.yaml b/playbooks/translation/propose-translation-update.yaml index 26f6594923..f6a83e350b 100644 --- a/playbooks/translation/propose-translation-update.yaml +++ b/playbooks/translation/propose-translation-update.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Propose Transaltion Updates + hosts: all roles: - prepare-zanata-client - legacy-zuul-git-prep-upper-constraints diff --git a/playbooks/translation/upstream-translation-update.yaml b/playbooks/translation/upstream-translation-update.yaml index b12790fa12..1a8a861ef3 100644 --- a/playbooks/translation/upstream-translation-update.yaml +++ b/playbooks/translation/upstream-translation-update.yaml @@ -1,4 +1,5 @@ -- hosts: all +- name: Upstream Translation Updates + hosts: all roles: - prepare-zanata-client - legacy-zuul-git-prep-upper-constraints @@ -9,6 +10,7 @@ args: chdir: "{{ zuul.project.src_dir }}" -- hosts: all +- name: Fetch Translation Output + hosts: all roles: - fetch-translation-output diff --git a/playbooks/wheel/release.yaml b/playbooks/wheel/release.yaml index 3b0f3120ee..0e76ee78eb 100644 --- a/playbooks/wheel/release.yaml +++ b/playbooks/wheel/release.yaml @@ -1,4 +1,5 @@ -- hosts: localhost +- name: Release AFS Volume + hosts: localhost roles: - role: create-afs-token diff --git a/roles/configure-git/tasks/main.yaml b/roles/configure-git/tasks/main.yaml index 694f0b5223..8dbc403d0b 100644 --- a/roles/configure-git/tasks/main.yaml +++ b/roles/configure-git/tasks/main.yaml @@ -1,6 +1,6 @@ --- - name: Configure Git - git_config: + community.general.git_config: name: "{{ item.key }}" scope: "{{ git_config_scope }}" value: "{{ item.value }}" diff --git a/roles/copy-proposal-common-scripts/tasks/main.yaml b/roles/copy-proposal-common-scripts/tasks/main.yaml index 331e34c189..818a0c6a98 100644 --- a/roles/copy-proposal-common-scripts/tasks/main.yaml +++ b/roles/copy-proposal-common-scripts/tasks/main.yaml @@ -3,6 +3,6 @@ # src is relative to the dir the playbook is in on the executor dest: "{{ ansible_user_dir }}/scripts/" src: '{{ item }}' - mode: 0755 + mode: '0755' with_items: - common.sh diff --git a/roles/copy-release-tools-scripts/tasks/main.yaml b/roles/copy-release-tools-scripts/tasks/main.yaml index da632ea09a..015a244696 100644 --- a/roles/copy-release-tools-scripts/tasks/main.yaml +++ b/roles/copy-release-tools-scripts/tasks/main.yaml @@ -4,6 +4,6 @@ state: directory - name: Copy the release-tools directory to the remote node - synchronize: + ansible.posix.synchronize: src: "release-tools/" dest: "{{ ansible_user_dir }}/scripts/release-tools" diff --git a/roles/fetch-translations-subunit-output/tasks/main.yaml b/roles/fetch-translations-subunit-output/tasks/main.yaml index 956214167d..c4228daccc 100644 --- a/roles/fetch-translations-subunit-output/tasks/main.yaml +++ b/roles/fetch-translations-subunit-output/tasks/main.yaml @@ -4,7 +4,7 @@ register: subunit - name: Collect test-results - synchronize: + ansible.posix.synchronize: dest: "{{ zuul.executor.log_root }}" mode: pull src: "{{ zuul_work_dir }}/testrepository.subunit.gz" diff --git a/roles/test-upload-logs/tasks/main.yaml b/roles/test-upload-logs/tasks/main.yaml index be642de0f9..b552bcc4b3 100644 --- a/roles/test-upload-logs/tasks/main.yaml +++ b/roles/test-upload-logs/tasks/main.yaml @@ -13,7 +13,7 @@ path: "{{ zuul_logserver_root }}/{{ zuul_log_path }}" state: directory recurse: yes - mode: 0775 + mode: '0775' # Use chmod instead of file because ansible 2.5 file with recurse and # follow can't really handle symlinks to . @@ -25,7 +25,7 @@ - skip_ansible_lint - name: Upload logs to log server - synchronize: + ansible.posix.synchronize: src: "{{ zuul.executor.log_root }}/" dest: "{{ zuul_logserver_root }}/{{ zuul_log_path }}/" rsync_opts: @@ -34,16 +34,16 @@ no_log: "{{ not zuul_log_verbose }}" # After this point there are no more logs - - name: gzip console log and json output + - name: Gzip console log and json output delegate_to: localhost - archive: + community.general.archive: path: "{{ zuul.executor.log_root }}/{{ item }}" with_items: - job-output.txt - job-output.json - name: Upload console log and json output - synchronize: + ansible.posix.synchronize: src: "{{ zuul.executor.log_root }}/{{ item }}.gz" dest: "{{ zuul_logserver_root }}/{{ zuul_log_path }}/{{ item }}.gz" verify_host: true diff --git a/tox.ini b/tox.ini index 7716c27336..a578d0fa90 100644 --- a/tox.ini +++ b/tox.ini @@ -33,10 +33,8 @@ deps = # keep this in sync with what Zuul uses so we don't allow though # things from a later ansible that would actually fail in # production. - ansible>=5,<6 - # pin these two until someone has time to update all our skips to >=6.16 - ansible-lint>=6.0.0,<6.5.0 - ansible-compat<4 + ansible>=8,<9 + ansible-lint<25.0.0 hacking>=7.0.0,<8.0.0 bashate>=0.2 commands = diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 4f9980caaf..7e58321860 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -3472,8 +3472,7 @@ - specs/.* - other-requirements.txt - tox.ini - - openstack-zuul-jobs-linters: - nodeset: ubuntu-jammy + - openstack-zuul-jobs-linters - project-config-dib - project-config-gerrit - project-config-grafana: @@ -3496,8 +3495,7 @@ files: *project-config-grafana-files - build-openstack-specs-site: files: *specs-site - - openstack-zuul-jobs-linters: - nodeset: ubuntu-jammy + - openstack-zuul-jobs-linters - project-config-dib - project-config-gerrit - project-config-grafana: