From a7596f1108a4b980149fcaed824129cad012279e Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 2 Dec 2024 17:43:55 +0300
Subject: [PATCH] testing

---
 clr_test/clearing-all/Dockerfile         |  5 +++--
 clr_test/clearing-all/launch_and_test.sh | 12 ++++++------
 clr_test/docker-compose.yml              |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/clr_test/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile
index f8aafd8b7..26ba5e1d8 100644
--- a/clr_test/clearing-all/Dockerfile
+++ b/clr_test/clearing-all/Dockerfile
@@ -32,8 +32,9 @@ RUN mkdir -p $CLEARING_HOME/files/xml/importer/in
 RUN mkdir -p $CLEARING_HOME/files/xml/importer/out
 RUN mkdir -p $CLEARING_HOME/files/xml/importer/error
 RUN mkdir -p $CLEARING_HOME/files/xml/exporter
-ARG CLR_TEST_NAME
-RUN mkdir -p $CLEARING_HOME_BIN/log/$CLR_TEST_NAME
+#ARG CLR_TEST_NAME
+#RUN mkdir -p $CLEARING_HOME_BIN/log/$CLR_TEST_NAME
+RUN mkdir -p $CLEARING_HOME_BIN/log_artifacts
 
 WORKDIR $CLEARING_HOME
 RUN sed -i 's/\r$//' $CLEARING_HOME/*.sh
diff --git a/clr_test/clearing-all/launch_and_test.sh b/clr_test/clearing-all/launch_and_test.sh
index 3fbac463a..a49c8f111 100644
--- a/clr_test/clearing-all/launch_and_test.sh
+++ b/clr_test/clearing-all/launch_and_test.sh
@@ -17,13 +17,13 @@ echo Run clearing-tester
 sh ./clearing_testing_utils/clearing-tester/clearing-tester.sh
 
 if [ -n "$CLR_TEST_NAME" ] && [ -d "./bin/log" ]; then
-    echo "Copying logs to ./bin/log/${CLR_TEST_NAME}"
-    mkdir -p "./bin/log/${CLR_TEST_NAME}"
+    echo "Copying logs to ./bin/log_artifacts/${CLR_TEST_NAME}"
     # Copy all contents from ./bin/log to tmp dir
-    mkdir -p "./bin/log_artifact"
-    cp -a ./bin/log/. "./bin/log_artifact/"
-     # Move the copied logs into the desired location
-    mv "./bin/log_artifact" "./bin/log/${CLR_TEST_NAME}"
+    mkdir -p "./bin/tmp_log_artifact"
+    cp -a ./bin/log/. "./bin/tmp_log_artifact/"
+     # Move the copied logs into the artifact location
+    mkdir -p "./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 or ./bin/log does not exist. Skipping log copy."
 fi
diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml
index 9d065a846..128565638 100644
--- a/clr_test/docker-compose.yml
+++ b/clr_test/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       - "8080:8080"
     volumes:
       - ./mnt/results:/opt/clearing/clearing_testing_utils/store/results
-      - logs_volume:/opt/clearing/bin/log/${CLR_TEST_NAME}
+      - logs_volume:/opt/clearing/bin/log_artifacts
       - ./mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs
       - ./mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs
 #      - ./mnt/dbfout:/opt/clearing/files/dbf/exporter/