From fb4ba8cd5bf31331e58b905339836503c7028f14 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 3 Sep 2017 18:03:01 -0500
Subject: [PATCH] Move ara output generation to post playbook

When there are issues, we hit POST FAILURE because ara generate gets
skipped. Move it.

Change-Id: Ib54f78c548999ed330d44e77ecbfc90944fec459
---
 .zuul.yaml                            |  4 +++-
 playbooks/zuul-stream/functional.yaml |  6 ------
 playbooks/zuul-stream/post-ara.yaml   | 14 ++++++++++++++
 playbooks/zuul-stream/post.yaml       |  1 -
 4 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 playbooks/zuul-stream/post-ara.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 1912eb54e6..26e4650d47 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,7 +19,9 @@
     nodes: zuul-functional
     pre-run: playbooks/zuul-stream/pre
     run: playbooks/zuul-stream/functional
-    post-run: playbooks/zuul-stream/post
+    post-run:
+      - playbooks/zuul-stream/post
+      - playbooks/zuul-stream/post-ara
     required-projects:
       - openstack/ara
 
diff --git a/playbooks/zuul-stream/functional.yaml b/playbooks/zuul-stream/functional.yaml
index 7b5b84f9e2..927503772e 100644
--- a/playbooks/zuul-stream/functional.yaml
+++ b/playbooks/zuul-stream/functional.yaml
@@ -58,9 +58,3 @@
       shell: |
         egrep "^.+\| node1 \| OSError.+\/failure-itemloop\/" job-output.txt
         egrep "^.+\| node2 \| OSError.+\/failure-itemloop\/" job-output.txt
-
-    - name: Generate ARA html
-      command: ara generate html ara-output
-
-    - name: Compress ARA html
-      command: gzip --recursive --best ara-output
diff --git a/playbooks/zuul-stream/post-ara.yaml b/playbooks/zuul-stream/post-ara.yaml
new file mode 100644
index 0000000000..e666d21ea5
--- /dev/null
+++ b/playbooks/zuul-stream/post-ara.yaml
@@ -0,0 +1,14 @@
+- hosts: controller
+  tasks:
+
+    - name: Generate ARA html
+      command: ara generate html ara-output
+
+    - name: Compress ARA html
+      command: gzip --recursive --best ara-output
+
+    - name: Fetch ARA files
+      synchronize:
+        src: "{{ ansible_user_dir }}/ara-output"
+        dest: "{{ zuul.executor.log_root }}/stream-files"
+        mode: pull
diff --git a/playbooks/zuul-stream/post.yaml b/playbooks/zuul-stream/post.yaml
index f3d4f9c8e1..2c717a82ea 100644
--- a/playbooks/zuul-stream/post.yaml
+++ b/playbooks/zuul-stream/post.yaml
@@ -23,4 +23,3 @@
         - ansible.cfg
         - stream-job-output.txt
         - job-output.json
-        - ara-output