From d45f6915998752781724ed1c809bfd3a516566ff Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 16 Jun 2018 09:19:34 -0500
Subject: [PATCH] Just use chmod instead of file for log permissions
The file module with recurse goes to the bad place when the content has
a symlink to '.'. Rather than fighting it - just use chmod -R, which
does what we want.
Change-Id: Ied4cc2a7e252db555ffdc3f1fd47edaf93b666da
---
roles/test-upload-logs/tasks/main.yaml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/roles/test-upload-logs/tasks/main.yaml b/roles/test-upload-logs/tasks/main.yaml
index ea8734abe9..7092734b1d 100644
--- a/roles/test-upload-logs/tasks/main.yaml
+++ b/roles/test-upload-logs/tasks/main.yaml
@@ -14,14 +14,14 @@
recurse: yes
mode: 0775
+ # Use chmod instead of file because ansible 2.5 file with recurse and
+ # follow can't really handle symlinks to .
- name: Ensure logs are readable before uploading
delegate_to: localhost
- file:
- path: "{{ zuul.executor.log_root }}/"
- mode: u=rwX,g=rX,o=rX
- state: directory
- follow: false
- recurse: yes
+ command: "chmod -R u=rwX,g=rX,o=rX {{ zuul.executor.log_root }}/"
+ # ANSIBLE0007 chmod used in place of argument mode to file
+ tags:
+ - skip_ansible_lint
- name: Upload logs to log server
synchronize: