From 7e1d6a87807b70000c781578eba5cabaa0025920 Mon Sep 17 00:00:00 2001
From: Albin Vass <albin.vass@volvocars.com>
Date: Tue, 7 Jan 2020 16:19:59 +0100
Subject: [PATCH] Do not keep owner when pulling zuul-output

Log synchronization fails when trying to preserve uid and guid
for a user and or group that doesn't exist on the executor.

This makes it so the owner and group is not preserved from the remote.

Simplify operations, use a single task with a loop instead of three
separate tasks.

Change-Id: I8ae937ba07e240ee4394374405aa841ad882022a
---
 roles/fetch-output/tasks/main.yaml | 35 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/roles/fetch-output/tasks/main.yaml b/roles/fetch-output/tasks/main.yaml
index b827a656d..28407891b 100644
--- a/roles/fetch-output/tasks/main.yaml
+++ b/roles/fetch-output/tasks/main.yaml
@@ -11,30 +11,29 @@
 - name: Ensure local output dirs
   delegate_to: localhost
   file:
-    path: "{{ item }}"
+    path: "{{ zj_output_dir }}"
     state: directory
   with_items:
     - "{{ log_path }}"
     - "{{ zuul.executor.work_root }}/artifacts"
     - "{{ zuul.executor.work_root }}/docs"
+  loop_control:
+    loop_var: zj_output_dir
 
-- name: Collect log output
+- name: Collect logs, artifacts and docs
   synchronize:
-    dest: "{{ log_path }}/"
+    dest: "{{ zj_output.dest }}/"
     mode: pull
-    src: "{{ zuul_output_dir }}/logs/"
-    verify_host: true
-
-- name: Collect artifacts
-  synchronize:
-    dest: "{{ zuul.executor.work_root }}/artifacts/"
-    mode: pull
-    src: "{{ zuul_output_dir }}/artifacts/"
-    verify_host: true
-
-- name: Collect docs
-  synchronize:
-    dest: "{{ zuul.executor.work_root }}/docs/"
-    mode: pull
-    src: "{{ zuul_output_dir }}/docs/"
+    src: "{{ zuul_output_dir }}/{{ zj_output.src }}/"
     verify_host: true
+    owner: false
+    group: false
+  loop:
+    - dest: "{{ log_path }}"
+      src: "logs"
+    - dest: "{{ zuul.executor.work_root }}/artifacts"
+      src: "artifacts"
+    - dest: "{{ zuul.executor.work_root }}/docs"
+      src: "docs"
+  loop_control:
+    loop_var: zj_output