From 57e29c36809605e6a36573f95dbc65f136349f44 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 4 Mar 2021 10:36:58 +1100
Subject: [PATCH] system-config-roles: only match jobs on roles tested

It seems we have some debugging to do on the openafs roles.  The other
roles here, particularly the bazelisk one, aren't tested here, so
reduce the file matcher.

We can overhaul this more, but it seems like a post-puppet/xenial
thing to do.

Change-Id: I0a41ef48eab0560a23a4e29463435dfe0758d01e
---
 roles-test/post.yaml            | 14 ++++++++++++++
 zuul.d/system-config-roles.yaml | 12 +++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 roles-test/post.yaml

diff --git a/roles-test/post.yaml b/roles-test/post.yaml
new file mode 100644
index 0000000000..c68266beef
--- /dev/null
+++ b/roles-test/post.yaml
@@ -0,0 +1,14 @@
+- hosts: localhost
+  tasks:
+    - name: Make log directories for testing hosts
+      file:
+        path: "{{ zuul.executor.log_root }}/{{ item }}/logs"
+        state: directory
+        recurse: true
+      loop: "{{ query('inventory_hostnames', 'all') }}"
+
+- hosts: all
+  tasks:
+    - include_role:
+        name: stage-output
+
diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index 1a635de78f..a66b2fee0f 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -10,8 +10,18 @@
     abstract: true
     parent: base
     run: roles-test/base.yaml
+    post-run: roles-test/post.yaml
     files:
-      - roles/
+      - roles/puppet-install
+      - roles/openafs-client
+      - roles/kerberos-client
+    vars:
+      zuul_copy_output: "{{ copy_output | combine(host_copy_output | default({})) }}"
+      stage_dir: "{{ ansible_user_dir }}/zuul-output"
+      copy_output:
+        '/var/log/syslog': logs_txt
+        '/var/log/messages': logs_txt
+        '/var/log/openafs': logs
 
 - job:
     name: system-config-zuul-role-integration-xenial