From 296183a4274289998f2339527c62c74a23a61809 Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Mon, 7 Oct 2024 14:49:14 +0200
Subject: [PATCH] Copy logs always

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 run_nightly_helm_charts.sh | 8 ++++----
 run_nightly_tests.sh       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/run_nightly_helm_charts.sh b/run_nightly_helm_charts.sh
index 76ce29d..ae6c45e 100755
--- a/run_nightly_helm_charts.sh
+++ b/run_nightly_helm_charts.sh
@@ -47,13 +47,13 @@ $TMT_COMMAND | tee -a "${LOG}"
 if [[ $? -ne 0 ]]; then
   echo "TMT command $TMT_COMMAND has failed."
   touch "${RESULTS_DIR}/${TARGET}-${TESTS}/tmt_failed"
-  if [[ -d "${DIR}/plans/${TFT_PLAN}/data/results" ]]; then
-    cp -rv "${DIR}/plans/${TFT_PLAN}/data/results/*" "${RESULTS_DIR}/${TARGET}-${TESTS}/plans/${TFT_PLAN}/data/results/"
-  fi
-  cp "${DIR}/log.txt" "${RESULTS_DIR}/${TARGET}-${TESTS}/"
 else
   touch "${RESULTS_DIR}/${TARGET}-${TESTS}/tmt_success"
 fi
+if [[ -d "${DIR}/plans/${TFT_PLAN}/data/results" ]]; then
+  cp -rv "${DIR}/plans/${TFT_PLAN}/data/results/*" "${RESULTS_DIR}/${TARGET}-${TESTS}/plans/${TFT_PLAN}/data/results/"
+fi
+cp "${DIR}/log.txt" "${RESULTS_DIR}/${TARGET}-${TESTS}/"
 set +o pipefail
 rm -f "${RESULTS_DIR}/${TARGET}-${TESTS}/tmt_running"
 cd "$CWD" || exit 1
diff --git a/run_nightly_tests.sh b/run_nightly_tests.sh
index 8535c73..4b31b82 100755
--- a/run_nightly_tests.sh
+++ b/run_nightly_tests.sh
@@ -93,13 +93,13 @@ $TMT_COMMAND | tee -a "${LOG}"
 if [[ $? -ne 0 ]]; then
   echo "TMT command $TMT_COMMAND has failed."
   touch "${RESULTS_DIR}/${TARGET}-${TESTS}/tmt_failed"
-  if [[ -d "${DIR}/plans/${TFT_PLAN}/data/" ]]; then
-    cp -rv "${DIR}/plans/${TFT_PLAN}/data/*" "${RESULTS_DIR}/${TARGET}-${TESTS}/plans/${TFT_PLAN}/data/"
-  fi
-  cp "${DIR}/log.txt" "${RESULTS_DIR}/${TARGET}-${TESTS}/"
 else
   touch "${RESULTS_DIR}/${TARGET}-${TESTS}/tmt_success"
 fi
+if [[ -d "${DIR}/plans/${TFT_PLAN}/data/" ]]; then
+  cp -rv "${DIR}/plans/${TFT_PLAN}/data/*" "${RESULTS_DIR}/${TARGET}-${TESTS}/plans/${TFT_PLAN}/data/"
+fi
+cp "${DIR}/log.txt" "${RESULTS_DIR}/${TARGET}-${TESTS}/"
 set +o pipefail
 rm -f "${RESULTS_DIR}/${TARGET}-${TESTS}/tmt_running"
 cd "$CWD" || exit 1