From 9bf1d6cdd315b1ad0e205cf53a3f9fedd838e9dd Mon Sep 17 00:00:00 2001
From: Ivan Nikolaev-Axenov <inikolaev-aksenov@nbki.ru>
Date: Fri, 31 May 2024 12:38:17 +0300
Subject: [PATCH] .gitlab-ci.yml updated v36

---
 .gitlab-ci.yml                         |  4 ++++
 clr_test/run_test_docker_containers.py | 27 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccb667340..d60fdff8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,10 @@ test:
   variables:
     CLEARING_TEST_DIR: "/builds/mfd/clearing/clearing_test"
     CLR_TEST_DIR: "/builds/mfd/clearing/clr_test"
+  artifacts:
+    name: "$CI_COMMIT_REF_NAME"
+    paths:
+      - clr_test/mnt/testFiles
   script:
     - apk update && apk add maven python3
     - cd clr_test
diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py
index 00d866dec..e00cf6ce9 100644
--- a/clr_test/run_test_docker_containers.py
+++ b/clr_test/run_test_docker_containers.py
@@ -8,22 +8,29 @@ DATA_ROOT_DIR = os.environ['CLEARING_TEST_DIR']
 CLR_TEST_DIR = os.environ['CLR_TEST_DIR']
 
 
-def run_docker():
+def run_docker(folder_name):
+    print(f"Running docker-compose for {folder_name}")
     os.chdir(CLR_TEST_DIR)
     subprocess.call(["docker", "compose", "down", "--volumes"])
-    subprocess.call(["docker", "compose", "up", "--abort-on-container-exit", "--exit-code-from", "clearing_system"])
+    subprocess.call(["docker", "compose", "up", "--build", "--abort-on-container-exit", "--exit-code-from", "clearing_system"])
     os.chdir("..")
-    
+
 
 def main():
     folders = [i for i in sorted(os.listdir(DATA_ROOT_DIR)) if re.search("\\d{1,}.\\d{1,}.*", i)]
-    for folder in folders:
-        shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store")
-        os.remove(f"{CLR_TEST_DIR}/db/export.sql")
-        os.remove(f"{CLR_TEST_DIR}/db/test-data.sql")
-        shutil.copytree(f"{DATA_ROOT_DIR}/{folder}/db/", f"{CLR_TEST_DIR}/db/", dirs_exist_ok=True)
-        shutil.copytree(f"{DATA_ROOT_DIR}/{folder}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/", dirs_exist_ok=True)
-        run_docker()
+    shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store")
+    os.remove(f"{CLR_TEST_DIR}/db/export.sql")
+    os.remove(f"{CLR_TEST_DIR}/db/test-data.sql")
+    shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/db/", f"{CLR_TEST_DIR}/db/", dirs_exist_ok=True)
+    shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/", dirs_exist_ok=True)
+    run_docker(folders[0])
+    # for folder in folders:
+    #     shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store")
+    #     os.remove(f"{CLR_TEST_DIR}/db/export.sql")
+    #     os.remove(f"{CLR_TEST_DIR}/db/test-data.sql")
+    #     shutil.copytree(f"{DATA_ROOT_DIR}/{folder}/db/", f"{CLR_TEST_DIR}/db/", dirs_exist_ok=True)
+    #     shutil.copytree(f"{DATA_ROOT_DIR}/{folder}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/", dirs_exist_ok=True)
+    #     run_docker(folder)
 
 
 if __name__=='__main__':