Collect more logs

Change-Id: If2c2579c9e2d6145c82e2d56bae5c185e6e193de

playbooks/files/apache.conf

@@ -1,7 +1,7 @@
 User zuul
 Group zuul
-ErrorLog /logs/error.log
+ErrorLog /logs/apache/error.log
-TransferLog /logs/access.log
+TransferLog /logs/apache/access.log
 
 LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
 LoadModule env_module /usr/lib/apache2/modules/mod_env.so

playbooks/post.yaml

@@ -1,14 +1,19 @@
 - hosts: all
   tasks:
+    - name: Collect logs
+      block:
+        # NOTE(SamYaple): https://github.com/ansible/ansible/issues/14131
+        - command: cp -r /home/zuul/.ansible_async /logs/async_logs
+        - command: journalctl -xb -u docker.service
+          register: docker_daemon_log
+          no_log: True
+        - copy:
+            content: "{{ docker_daemon_log.stdout }}"
+            dest: /logs/docker_daemon.log
+      become: true
+
     - name: Copy logs
       synchronize:
-        src: '/logs'
+        src: /logs
-        dest: '{{ zuul.executor.log_root }}'
+        dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}"
         mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs

playbooks/setup-gate.yaml

@@ -60,15 +60,16 @@
             jump: ACCEPT
       become: True
 
-    - name: Setup http server for git and wheels
+    - name: Setup http server for git repos
       block:
         - file:
             path: "{{ item.path }}"
             owner: "{{ item.owner }}"
             state: directory
           with_items:
-            - path: /logs/
+            - path: /logs/apache/
               owner: zuul
+              recurse: True
             - path: /webroot/
               owner: zuul
             - path: /etc/systemd/system/apache2.service.d/