diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33b6fb220..abfe28a18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,10 +26,9 @@ test: stage: test script: - cd clr_test - - docker ps --all - - docker images --all - pwd - - ls -la ../z-distr/target/clearing - - ls -la /builds/mfd/clearing/z-distr/target/clearing/db + - cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin + - cp -r /builds/mfd/clearing/z-distr/target/clearing/settings ./clearing-all/settings + - cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./clearing-all/db - 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 beb37596b..e263597da 100644 --- a/clr_test/clearing-all/Dockerfile +++ b/clr_test/clearing-all/Dockerfile @@ -4,8 +4,8 @@ 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 +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 4e9acc652..5e4e7c885 100644 --- a/clr_test/clearing-all/db/Dockerfile +++ b/clr_test/clearing-all/db/Dockerfile @@ -1,5 +1,5 @@ FROM mirror.gcr.io/postgres:14.1-alpine -ADD ../../../z-distr/target/clearing/db/DDL.sql /docker-entrypoint-initdb.d/ +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