diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b03ccb52b..f5a207a15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,16 +24,16 @@ preflight: paths: - clearing_test -build: - image: ${DOCKER_PROXY}/maven:latest - stage: build - script: - - mvn clean package -DskipTests -Pdistributive - artifacts: - name: "$CI_COMMIT_REF_NAME" - expire_in: 1 day - paths: - - /builds/mfd/clearing/z-distr/target/clearing +#build: +# image: ${DOCKER_PROXY}/maven:latest +# stage: build +# script: +# - mvn clean package -DskipTests -Pdistributive +# artifacts: +# name: "$CI_COMMIT_REF_NAME" +# expire_in: 1 day +# paths: +# - /builds/mfd/clearing/z-distr/target/clearing test: stage: test @@ -44,10 +44,10 @@ test: artifacts: name: "$CI_COMMIT_REF_NAME" paths: - - /builds/mfd/clearing/clr_test/mnt + - /root/clr_test/mnt script: - echo "Installing maven and python" && apk update && apk add maven python3 - cd clr_test - - echo "Copying jar files to clearing-all/bin" && cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin +# - 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 run_test_docker_containers.py diff --git a/clr_test/clearing-all/bin/backend-api.jar b/clr_test/clearing-all/bin/backend-api.jar new file mode 100644 index 000000000..c77795dc3 Binary files /dev/null and b/clr_test/clearing-all/bin/backend-api.jar differ diff --git a/clr_test/clearing-all/bin/clearing-service.jar b/clr_test/clearing-all/bin/clearing-service.jar new file mode 100644 index 000000000..5215925e1 Binary files /dev/null and b/clr_test/clearing-all/bin/clearing-service.jar differ diff --git a/clr_test/clearing-all/bin/dbf-exporter.jar b/clr_test/clearing-all/bin/dbf-exporter.jar new file mode 100644 index 000000000..ee8ddb6b7 Binary files /dev/null and b/clr_test/clearing-all/bin/dbf-exporter.jar differ diff --git a/clr_test/clearing-all/bin/dbf-importer.jar b/clr_test/clearing-all/bin/dbf-importer.jar new file mode 100644 index 000000000..64d4784c5 Binary files /dev/null and b/clr_test/clearing-all/bin/dbf-importer.jar differ diff --git a/clr_test/clearing-all/bin/imdg.jar b/clr_test/clearing-all/bin/imdg.jar new file mode 100644 index 000000000..0bdef43f2 Binary files /dev/null and b/clr_test/clearing-all/bin/imdg.jar differ diff --git a/clr_test/clearing-all/bin/scheduler-service.jar b/clr_test/clearing-all/bin/scheduler-service.jar new file mode 100644 index 000000000..2111ea2cf Binary files /dev/null and b/clr_test/clearing-all/bin/scheduler-service.jar differ diff --git a/clr_test/clearing-all/bin/swt-exporter.jar b/clr_test/clearing-all/bin/swt-exporter.jar new file mode 100644 index 000000000..fb28d3b30 Binary files /dev/null and b/clr_test/clearing-all/bin/swt-exporter.jar differ diff --git a/clr_test/clearing-all/bin/swt-importer.jar b/clr_test/clearing-all/bin/swt-importer.jar new file mode 100644 index 000000000..6338eae23 Binary files /dev/null and b/clr_test/clearing-all/bin/swt-importer.jar differ diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml index bb136a9af..c778690de 100644 --- a/clr_test/docker-compose.yml +++ b/clr_test/docker-compose.yml @@ -33,12 +33,12 @@ services: - "7090:7090" - "7020:7020" - "8080:8080" -# volumes: -# - /builds/mfd/clearing/clr_test/mnt:/opt/clearing/files -# - /builds/mfd/clearing/clr_test/mnt/results:/opt/clearing/clearing_testing_utils/store/results -# - /builds/mfd/clearing/clr_test/mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs -# - /builds/mfd/clearing/clr_test/mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs -# - /builds/mfd/clearing/clr_test/mnt/logs/clearing:/opt/clearing/bin/log + volumes: + - /root/clr_test/mnt:/opt/clearing/files + - /root/clr_test/mnt/results:/opt/clearing/clearing_testing_utils/store/results + - /root/clr_test/mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs + - /root/clr_test/mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs + - /root/clr_test/mnt/logs/clearing:/opt/clearing/bin/log # restart: always zookeeper: