From 87b72781bd5b05cc072393c624dcc420f4fa8d6a Mon Sep 17 00:00:00 2001
From: Ronelle Landy <rlandy@redhat.com>
Date: Tue, 28 Nov 2017 11:36:56 -0500
Subject: [PATCH] Add ui_validate_simple to the logs collected

The ui_validate_simple test has been failing of late and
it is hard to debug since logs are not collected
from localhost.
This review copies all the .sh and .log files
from the local working dir to the log directory so that
they are included in log collection.

Related-Bug: 1734928
Change-Id: I3bc646f5d1d9584cef4e624e5904f7e88c59442e
---
 roles/collect-logs/tasks/publish.yml | 8 ++++++++
 roles/validate-ui/meta/main.yml      | 2 ++
 roles/validate-ui/tasks/main.yml     | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 roles/validate-ui/meta/main.yml

diff --git a/roles/collect-logs/tasks/publish.yml b/roles/collect-logs/tasks/publish.yml
index b4527f3c9..4f729e562 100644
--- a/roles/collect-logs/tasks/publish.yml
+++ b/roles/collect-logs/tasks/publish.yml
@@ -35,6 +35,14 @@
     cp {{ artcl_collect_dir }}/undercloud/home/stack/tempest/tempest.{xml,html}{,.gz} {{ artcl_collect_dir }} || true;
     gunzip {{ artcl_collect_dir }}/tempest.{xml,html}.gz || true;
 
+- name: Fetch .sh and .log files from local working directory on localhost
+  shell: >
+    cp {{ item }} {{ artcl_collect_dir }}/
+  with_items:
+    - "{{ local_working_dir }}/*.sh"
+    - "{{ local_working_dir }}/*.log"
+  ignore_errors: "yes"
+
 - name: Rename compressed text based files to end with txt.gz extension
   shell: >
     find {{ artcl_collect_dir }}/ -type f |
diff --git a/roles/validate-ui/meta/main.yml b/roles/validate-ui/meta/main.yml
new file mode 100644
index 000000000..819da26a3
--- /dev/null
+++ b/roles/validate-ui/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - extras-common
diff --git a/roles/validate-ui/tasks/main.yml b/roles/validate-ui/tasks/main.yml
index e2442cd13..b99c51923 100644
--- a/roles/validate-ui/tasks/main.yml
+++ b/roles/validate-ui/tasks/main.yml
@@ -9,4 +9,4 @@
   shell: >
     set -o pipefail &&
     {{ local_working_dir }}/ui_validate_simple.sh
-    2>&1  {{ ui_validate_simple_log }}
\ No newline at end of file
+    | tee {{ ui_validate_simple_log }}