qa: For teuthology copy logs to teuthology expected location

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f0964beac5b8b54bc44a11bfb50bdea1f2ae8825)

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 77622f9ec0ba3ad7b1ff0e8ce692086548e0c247..a867ca068ae60a7702ba5d1d011cf97eb42c3459 100755 (executable)
--- 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)