From b95f12ed8f6d5b2eab430685d76f55c7eb672c1e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 7 Jan 2019 14:04:56 +0000
Subject: [PATCH] Add fetch-output to base jobs

This change was added in OpenStack's base job as part of the effort to
provide a standard interface on the remote nodes into which logs can be put
regardless of how they are eventually going to be uploaded.

Change-Id: I07f1a88f357c68d3deeadf7f12b1b77fc4a948f4
---
 playbooks/base-test/{post-ssh.yaml => post.yaml} | 4 ++++
 playbooks/base/{post-ssh.yaml => post.yaml}      | 4 ++++
 zuul.yaml                                        | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)
 rename playbooks/base-test/{post-ssh.yaml => post.yaml} (53%)
 rename playbooks/base/{post-ssh.yaml => post.yaml} (53%)

diff --git a/playbooks/base-test/post-ssh.yaml b/playbooks/base-test/post.yaml
similarity index 53%
rename from playbooks/base-test/post-ssh.yaml
rename to playbooks/base-test/post.yaml
index d793838..a021a08 100644
--- a/playbooks/base-test/post-ssh.yaml
+++ b/playbooks/base-test/post.yaml
@@ -1,3 +1,7 @@
+- hosts: all
+  roles:
+    - fetch-output
+
 - hosts: all
   roles:
     - remove-build-sshkey
diff --git a/playbooks/base/post-ssh.yaml b/playbooks/base/post.yaml
similarity index 53%
rename from playbooks/base/post-ssh.yaml
rename to playbooks/base/post.yaml
index d793838..a021a08 100644
--- a/playbooks/base/post-ssh.yaml
+++ b/playbooks/base/post.yaml
@@ -1,3 +1,7 @@
+- hosts: all
+  roles:
+    - fetch-output
+
 - hosts: all
   roles:
     - remove-build-sshkey
diff --git a/zuul.yaml b/zuul.yaml
index 9aaa6d7..b16f321 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -10,7 +10,7 @@
 
       It also sets a default timeout value (which may be overidden).
     pre-run: playbooks/base/pre.yaml
-    post-run: playbooks/base/post-ssh.yaml
+    post-run: playbooks/base/post.yaml
     roles:
       - zuul: git.zuul-ci.org/zuul-jobs
     timeout: 1800
@@ -22,7 +22,7 @@
       A job to test changes to the base job without disturbing the
       main job in production.  Not for general use.
     pre-run: playbooks/base-test/pre.yaml
-    post-run: playbooks/base-test/post-ssh.yaml
+    post-run: playbooks/base-test/post.yaml
     roles:
       - zuul: git.zuul-ci.org/zuul-jobs
     timeout: 1800