From f092833de85c6d4175846a2e5e5ae0482c73b982 Mon Sep 17 00:00:00 2001
From: Ivan Nikolaev-Axenov <nikolaevaxenov@gmail.com>
Date: Tue, 2 Jul 2024 17:42:37 +0300
Subject: [PATCH] .gitlab-ci.yml updated v108

---
 .gitlab-ci.yml | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e5be2b21..9b1508ee9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,25 @@ preflight:
 #    paths:
 #      - /builds/mfd/clearing/z-distr/target/clearing
 
+#test:
+#  stage: test
+#  variables:
+#    CLEARING_TEST_DIR: "/builds/mfd/clearing/clearing_test"
+#    CLR_TEST_DIR: "/builds/mfd/clearing/clr_test"
+#    RESULT_FILES_DIR: "/builds/mfd/clearing/clr_test/result-files"
+#  script:
+#    - echo $CI_PROJECT_DIR
+#    - pwd
+#    - 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 ./clearing-all/bin
+##    - echo "Copying DDL.sql to db directory" && cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db
+#    - python3 clr_test/run_test_docker_containers.py
+#  artifacts:
+#    expire_in: 1 day
+#    when: always
+#    paths:
+#      - $CI_PROJECT_DIR/
+
 test:
   stage: test
   variables:
@@ -42,14 +61,18 @@ test:
     CLR_TEST_DIR: "/builds/mfd/clearing/clr_test"
     RESULT_FILES_DIR: "/builds/mfd/clearing/clr_test/result-files"
   script:
-    - echo $CI_PROJECT_DIR
-    - pwd
-    - 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 ./clearing-all/bin
-#    - echo "Copying DDL.sql to db directory" && cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db
-    - python3 clr_test/run_test_docker_containers.py
+    - cd clr_test
+    - rm -rf /builds/mfd/clearing/clr_test/clearing-all/clearing_testing_utils/store/expected
+    - rm -rf /builds/mfd/clearing/clr_test/clearing-all/clearing_testing_utils/store/input
+    - rm /builds/mfd/clearing/clr_test/db/export.sql
+    - rm /builds/mfd/clearing/clr_test/db/test-data.sql
+    - cp -r /builds/mfd/clearing/clearing_test/1.0.SESN.MKR.CURR/db/. /builds/mfd/clearing/clr_test/db/
+    - cp -r /builds/mfd/clearing/clearing_test/1.0.SESN.MKR.CURR/clearing_testing_utils/. /builds/mfd/clearing/clr_test/clearing-all/clearing_testing_utils/
+    - docker compose pull
+    - docker compose build --no-cache
+    - docker compose up --abort-on-container-exit --exit-code-from clearing_system
   artifacts:
     expire_in: 1 day
     when: always
     paths:
-      - $CI_PROJECT_DIR/
+      - $CI_PROJECT_DIR/
\ No newline at end of file