From: David Zafman <dzafman@redhat.com>
Date: Thu, 21 Jun 2018 00:04:50 +0000 (-0700)
Subject: qa: For teuthology copy logs to teuthology expected location
X-Git-Tag: v14.0.1~987^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f0964beac5b8b54bc44a11bfb50bdea1f2ae8825;p=ceph.git

qa: For teuthology copy logs to teuthology expected location

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 2cae98bc5ff42..edb829d720015 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -170,7 +170,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)