From ca7de58905e626309486ed0449ddc43a49ca8ade Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 28 Mar 2018 12:28:03 -0400
Subject: [PATCH] Use recursive: false for log collection

Don't recursive copy subdirectories when collecting logs, as we don't
know what is inside them. This means we need to be more speciic of
which directories we want to copy.

Change-Id: I50691a2536d1f4127eddd133f6d99157085ed76c
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 tests/collect-logs.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/collect-logs.yaml b/tests/collect-logs.yaml
index 81a07e7..c9038bc 100644
--- a/tests/collect-logs.yaml
+++ b/tests/collect-logs.yaml
@@ -41,6 +41,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"
@@ -75,6 +76,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"
@@ -82,8 +84,8 @@
       with_items:
         - /etc/nodepool/builder-logging.conf
         - /etc/nodepool/nodepool.yaml
+        - /var/log/nodepool/builds/*.log
         - /var/log/nodepool/builder-debug.log
-        - /var/log/nodepool/builds
         - /var/log/nodepool/nodepool-builder.log
 
 - hosts: nl01
@@ -112,6 +114,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"
@@ -148,6 +151,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"
@@ -185,6 +189,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname}}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"
@@ -222,6 +227,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"
@@ -259,6 +265,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"
@@ -296,6 +303,7 @@
       synchronize:
         dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}"
         mode: pull
+        recursive: false
         rsync_opts:
           - "--relative"
         src: "{{ item }}"