From a7d03ce60f94b190c020862a3b783205569d3cd3 Mon Sep 17 00:00:00 2001
From: Ivan Nikolaev-Axenov <nikolaevaxenov@gmail.com>
Date: Thu, 30 May 2024 13:46:27 +0300
Subject: [PATCH] .gitlab-ci.yml updated v21

---
 .gitlab-ci.yml                      | 6 ++----
 clr_test/clearing-all/Dockerfile    | 6 ++++--
 clr_test/clearing-all/db/Dockerfile | 4 +++-
 clr_test/docker-compose.yml         | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 646719f47..efca9c453 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@ build:
   image: ${DOCKER_PROXY}/maven:latest
   stage: build
   script:
-#    - mvn clean package -DskipTests -Pdistributive
-    - mvn --version
+    - mvn clean package -DskipTests -Pdistributive
+#    - mvn --version
   artifacts:
     name: "$CI_COMMIT_REF_NAME"
     paths:
@@ -25,8 +25,6 @@ test:
   stage: test
   script:
     - cd clr_test
-#    - ls ../z-distr/target/clearing/bin
-#    - ls ../z-distr/target/clearing/db
     - pwd
     - docker-compose down --volumes
     - docker compose up --build --force-recreate --abort-on-container-exit --exit-code-from clearing_system
diff --git a/clr_test/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile
index 42dcede75..209314043 100644
--- a/clr_test/clearing-all/Dockerfile
+++ b/clr_test/clearing-all/Dockerfile
@@ -4,8 +4,10 @@ ENV CLEARING_HOME="/opt/clearing"
 ENV CLEARING_HOME_BIN="/opt/clearing/bin"
 ENV CLEARING_HOME_CFG="/opt/clearing/bin"
 
-ADD ../../z-distr/target/clearing/bin $CLEARING_HOME_BIN
-ADD ../../z-distr/target/clearing/settings $CLEARING_HOME/settings
+WORKDIR /builds/mfd/clearing/z-distr/target/clearing/
+
+ADD ./bin $CLEARING_HOME_BIN
+ADD ./settings $CLEARING_HOME/settings
 
 ADD ./kill_all.sh $CLEARING_HOME/kill_all.sh
 ADD ./launch_all.sh $CLEARING_HOME/launch_all.sh
diff --git a/clr_test/clearing-all/db/Dockerfile b/clr_test/clearing-all/db/Dockerfile
index 64e095e93..b5e57467c 100644
--- a/clr_test/clearing-all/db/Dockerfile
+++ b/clr_test/clearing-all/db/Dockerfile
@@ -1,5 +1,7 @@
 FROM mirror.gcr.io/postgres:14.1-alpine
 
-ADD ../../z-distr/target/clearing/db/DDL.sql /docker-entrypoint-initdb.d/
+WORKDIR /builds/mfd/clearing/z-distr/target/clearing/db
+
+ADD DDL.sql /docker-entrypoint-initdb.d/
 ADD export.sql /docker-entrypoint-initdb.d/
 ADD test-data.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml
index 4aa250bb0..c1b842d15 100644
--- a/clr_test/docker-compose.yml
+++ b/clr_test/docker-compose.yml
@@ -34,7 +34,7 @@ services:
       - "7020:7020"
       - "8080:8080"
     volumes:
-      - /opt/mfd/clr_test_new/mnt/testFiles:/opt/clearing/clearing_testing_utils/store/results
+      - /builds/mfd/clearing/clr_test/mnt/testFiles:/opt/clearing/clearing_testing_utils/store/results
     # restart: always
 
   zookeeper: