From 76037c434e65cd5eb207a281eb33bce6cf771c34 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 28 Jul 2022 11:14:11 +1000 Subject: [PATCH] linter: add name to blocks A later version of ansible-lint enforces names on blocks. This is generally a good rule; fix a few missing blocks here. Change-Id: Ia87a0c21ec0ed1662e37cbc9e17a0df344b54e57 --- playbooks/javascript/release.yaml | 3 ++- playbooks/publish/openstack-artifacts.yaml | 3 ++- playbooks/translation/openstack-translation-artifacts.yaml | 3 ++- roles/test-upload-logs/tasks/main.yaml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/playbooks/javascript/release.yaml b/playbooks/javascript/release.yaml index d1a616ef8c..4c275da46d 100644 --- a/playbooks/javascript/release.yaml +++ b/playbooks/javascript/release.yaml @@ -10,7 +10,8 @@ # 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. - - block: + - name: Upload to NPM + block: - name: Upload to npm include_role: name: upload-npm diff --git a/playbooks/publish/openstack-artifacts.yaml b/playbooks/publish/openstack-artifacts.yaml index 4dc30323c1..105c724f3e 100644 --- a/playbooks/publish/openstack-artifacts.yaml +++ b/playbooks/publish/openstack-artifacts.yaml @@ -1,6 +1,7 @@ - hosts: localhost tasks: - - block: + - name: Upload to AFS + block: - name: Create AFS token include_role: name: create-afs-token diff --git a/playbooks/translation/openstack-translation-artifacts.yaml b/playbooks/translation/openstack-translation-artifacts.yaml index c943d0a343..8bcfa18743 100644 --- a/playbooks/translation/openstack-translation-artifacts.yaml +++ b/playbooks/translation/openstack-translation-artifacts.yaml @@ -1,6 +1,7 @@ - hosts: localhost tasks: - - block: + - name: Upload to AFS + block: - name: Create AFS token include_role: name: create-afs-token diff --git a/roles/test-upload-logs/tasks/main.yaml b/roles/test-upload-logs/tasks/main.yaml index cd2b46a4c5..be642de0f9 100644 --- a/roles/test-upload-logs/tasks/main.yaml +++ b/roles/test-upload-logs/tasks/main.yaml @@ -3,7 +3,8 @@ name: set-zuul-log-path-fact # Always upload (true), never upload (false) or only on failure ('failure') -- when: zuul_site_upload_logs | default(true) | bool or +- name: Upload logs + when: zuul_site_upload_logs | default(true) | bool or (zuul_site_upload_logs == 'failure' and not zuul_success | bool) block: