From 4a719d0fe42e0075a2858eec5f495b9dd724295a Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Fri, 16 Aug 2019 08:29:59 -0700
Subject: [PATCH] Collect more information from quickstart failures

When the quickstart job fails, make sure that we get stderr from
the docker logs.  Also, add timestamps to the waiting to start
script so that we can compare when it gave up to when systems
came online.

Change-Id: I632c794de7fb792fbe7d0b8e095701a5d7fd1af7
---
 .../playbooks/wait-to-start-gearman.sh        |  4 ++--
 .../admin/examples/playbooks/wait-to-start.sh |  8 ++++----
 playbooks/quick-start/post.yaml               | 20 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/doc/source/admin/examples/playbooks/wait-to-start-gearman.sh b/doc/source/admin/examples/playbooks/wait-to-start-gearman.sh
index af11d705e3..f76ed5cb6a 100755
--- a/doc/source/admin/examples/playbooks/wait-to-start-gearman.sh
+++ b/doc/source/admin/examples/playbooks/wait-to-start-gearman.sh
@@ -4,13 +4,13 @@
 # start.
 
 wait_for_gearman() {
-    echo "Wait for gearman to start"
+    echo `date -Iseconds` "Wait for gearman to start"
     for i in $(seq 1 120); do
         cat < /dev/null > /dev/tcp/scheduler/4730 && return
         sleep 1
     done
 
-    echo "Timeout waiting for mysql"
+    echo `date -Iseconds` "Timeout waiting for gearman"
     exit 1
 }
 
diff --git a/doc/source/admin/examples/playbooks/wait-to-start.sh b/doc/source/admin/examples/playbooks/wait-to-start.sh
index 1154fcf448..4fd965cf98 100755
--- a/doc/source/admin/examples/playbooks/wait-to-start.sh
+++ b/doc/source/admin/examples/playbooks/wait-to-start.sh
@@ -4,24 +4,24 @@
 # start.
 
 wait_for_mysql() {
-    echo "Wait for mysql to start"
+    echo `date -Iseconds` "Wait for mysql to start"
     for i in $(seq 1 120); do
         cat < /dev/null > /dev/tcp/mysql/3306 && return
         sleep 1
     done
 
-    echo "Timeout waiting for mysql"
+    echo `date -Iseconds` "Timeout waiting for mysql"
     exit 1
 }
 
 wait_for_gerrit() {
-    echo "Wait for zuul user to be created"
+    echo `date -Iseconds` "Wait for zuul user to be created"
     for i in $(seq 1 120); do
         [ $(curl -s -o /dev/null -w "%{http_code}" http://admin:secret@gerrit:8080/a/accounts/zuul/sshkeys) = "200" ] && return
         sleep 1
     done
 
-    echo "Timeout waiting for gerrit"
+    echo `date -Iseconds` "Timeout waiting for gerrit"
     exit 1
 }
 
diff --git a/playbooks/quick-start/post.yaml b/playbooks/quick-start/post.yaml
index 3c11365440..0b007cc535 100644
--- a/playbooks/quick-start/post.yaml
+++ b/playbooks/quick-start/post.yaml
@@ -8,16 +8,16 @@
     - name: Save docker log files
       become: true
       shell: |
-        docker logs examples_gerrit_1 > {{ ansible_user_dir }}/logs/gerrit.log
-        docker logs examples_gerritconfig_1 > {{ ansible_user_dir }}/logs/gerritconfig.log
-        docker logs examples_zk_1 > {{ ansible_user_dir }}/logs/zk.log
-        docker logs examples_mysql_1 > {{ ansible_user_dir }}/logs/mysql.log
-        docker logs examples_scheduler_1 > {{ ansible_user_dir }}/logs/scheduler.log
-        docker logs examples_web_1 > {{ ansible_user_dir }}/logs/web.log
-        docker logs examples_executor_1 > {{ ansible_user_dir }}/logs/executor.log
-        docker logs examples_node_1 > {{ ansible_user_dir }}/logs/node.log
-        docker logs examples_launcher_1 > {{ ansible_user_dir }}/logs/launcher.log
-        docker logs examples_logs_1 > {{ ansible_user_dir }}/logs/logs.log
+        docker logs examples_gerrit_1 > {{ ansible_user_dir }}/logs/gerrit.log 2>&1
+        docker logs examples_gerritconfig_1 > {{ ansible_user_dir }}/logs/gerritconfig.log 2>&1
+        docker logs examples_zk_1 > {{ ansible_user_dir }}/logs/zk.log 2>&1
+        docker logs examples_mysql_1 > {{ ansible_user_dir }}/logs/mysql.log 2>&1
+        docker logs examples_scheduler_1 > {{ ansible_user_dir }}/logs/scheduler.log 2>&1
+        docker logs examples_web_1 > {{ ansible_user_dir }}/logs/web.log 2>&1
+        docker logs examples_executor_1 > {{ ansible_user_dir }}/logs/executor.log 2>&1
+        docker logs examples_node_1 > {{ ansible_user_dir }}/logs/node.log 2>&1
+        docker logs examples_launcher_1 > {{ ansible_user_dir }}/logs/launcher.log 2>&1
+        docker logs examples_logs_1 > {{ ansible_user_dir }}/logs/logs.log 2>&1
     - name: Copy docker log files to executor
       synchronize:
         mode: pull