From 19a303e777b5e1bbb7fe9ee50e6e353622b472ba Mon Sep 17 00:00:00 2001
From: David Zafman <dzafman@redhat.com>
Date: Wed, 20 Jun 2018 17:04:50 -0700
Subject: [PATCH] qa: For teuthology copy logs to teuthology expected location

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f0964beac5b8b54bc44a11bfb50bdea1f2ae8825)
---
 qa/standalone/ceph-helpers.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 77622f9ec0ba3..a867ca068ae60 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -168,7 +168,13 @@ function teardown() {
         fi
     fi
     if [ "$cores" = "yes" -o "$dumplogs" = "1" ]; then
-        display_logs $dir
+	if [ -n "$LOCALRUN" ]; then
+	    display_logs $dir
+        else
+	    # Move logs to where Teuthology will archive it
+	    sudo mkdir -p $TESTDIR/archive/log
+	    sudo mv $dir/*.log $TESTDIR/archive/log
+	fi
     fi
     rm -fr $dir
     rm -rf $(get_asok_dir)
-- 
2.39.5