From 3a9fb12a9828ef08abd9c3622fa07471d3d7f0c1 Mon Sep 17 00:00:00 2001
From: Ivan Nikolaev-Axenov <nikolaevaxenov@gmail.com>
Date: Fri, 21 Mar 2025 11:17:30 +0300
Subject: [PATCH] fix v5

---
 .gitlab-ci.yml                           | 1 +
 clr_test/clearing-all/launch_and_test.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29c861515..bf0bce65b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,7 @@ test:
   script:
     - echo "Installing maven and python" && apk update && apk add maven python3
     - echo "Copying jar files to clearing-all/bin" && cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clr_test/clearing-all/bin
+    - echo "Removing old logs folder artifacts/logs" && rm -rf artifacts/logs
     - python3 clr_test/run_test_docker_containers.py
     - echo "Copying logs" && mkdir -p artifacts/logs && docker run --rm -v clr_test_logs_volume:/logs alpine tar -C /logs -cf - . | tar -C artifacts/logs -xf -
     - echo "Cleaning up log volume" && docker volume rm clr_test_logs_volume
diff --git a/clr_test/clearing-all/launch_and_test.sh b/clr_test/clearing-all/launch_and_test.sh
index e71dc1fe7..b1274c269 100644
--- a/clr_test/clearing-all/launch_and_test.sh
+++ b/clr_test/clearing-all/launch_and_test.sh
@@ -111,7 +111,7 @@ then
   fi
 
   # Move the copied logs into the artifact location
-  mkdir -p "./bin/log_artifacts/${CLR_TEST_NAME}"
+  mkdir -p "./bin/log_artifacts/${CLR_TEST_NAME}" || rm -rf "./bin/log_artifacts/${CLR_TEST_NAME}/*"
   mv ./bin/tmp_log_artifact/* "./bin/log_artifacts/${CLR_TEST_NAME}"
 else
   echo "CLR_TEST_NAME is not set. Skipping log copy."