From: Ernesto Puerta <epuertat@redhat.com>
Date: Thu, 3 Sep 2020 14:26:17 +0000 (+0200)
Subject: mgr/dashboard: fix duplicate logs
X-Git-Tag: v16.1.0~1163^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e2f5a652914587efb785799a4799fc0ac27dff7;p=ceph.git

mgr/dashboard: fix duplicate logs

Fixes: https://tracker.ceph.com/issues/47285
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/run-backend-api-tests.sh b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
index 9faa306500c0..d37c4a3ee0f1 100755
--- a/src/pybind/mgr/dashboard/run-backend-api-tests.sh
+++ b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
@@ -81,10 +81,11 @@ display_log() {
 
 on_tests_error() {
     local ret=$?
-    if [[ -n "$JENKINS_HOME" ]]; then
+    if [[ -n "$JENKINS_HOME" && -z "$ON_TESTS_ERROR_RUN" ]]; then
         CEPH_OUT_DIR=${CEPH_OUT_DIR:-"$LOCAL_BUILD_DIR"/out}
         display_log "mgr" 1000
         display_log "osd" 1000
+        ON_TESTS_ERROR_RUN=1
     fi
     return $ret
 }