From e3c685f4b52a981dd1340b0eb40b89f0b2e8e999 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Mon, 3 Jun 2024 14:02:33 +0300 Subject: [PATCH] .gitlab-ci.yml updated v52 --- .../clearing-checker/application.properties | 2 +- .../clearing-converter/application.properties | 2 +- .../clearing-tester/application.properties | 12 ++++++------ .../settings/dbf-exporter/application.properties | 8 ++++---- .../settings/dbf-importer/application.properties | 6 +++--- .../settings/swt-exporter/application.properties | 2 +- .../settings/swt-importer/application.properties | 8 ++++---- clr_test/run_test_docker_containers.py | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-checker/application.properties b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/application.properties index fd1d6bdb8..2f04886ab 100644 --- a/clr_test/clearing-all/clearing_testing_utils/clearing-checker/application.properties +++ b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/application.properties @@ -1,4 +1,4 @@ server.port=9902 dbf-swt-checker.encoding=UTF-8 -dbf-swt-checker.rootDir=/opt/clearing/clearing_testing_utils/clearing-checker/res/ \ No newline at end of file +dbf-swt-checker.rootDir=/builds/mfd/clearing/clr_test/clearing-all/clearing_testing_utils/clearing-checker/res/ \ No newline at end of file diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-converter/application.properties b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/application.properties index 2e64a357f..0beee2058 100644 --- a/clr_test/clearing-all/clearing_testing_utils/clearing-converter/application.properties +++ b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/application.properties @@ -1,4 +1,4 @@ -clearing-converter.store.root-dir=/opt/clearing/clearing_testing_utils/clearing-converter/ +clearing-converter.store.root-dir=/builds/mfd/clearing/clr_test/clearing-all/clearing_testing_utils/clearing-converter/ clearing-converter.encoding-source=cp866 server.port=9901 server.servlet.context-path=/converter \ No newline at end of file diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties index b318eda4c..9aecf265c 100644 --- a/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties +++ b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties @@ -1,13 +1,13 @@ server.port=9900 #local storage settings -clearing-tester.store.root-dir=/opt/clearing/clearing_testing_utils/store +clearing-tester.store.root-dir=/builds/mfd/clearing/clr_test/clearing-all/clearing_testing_utils/store #sftp storage settings -clearing-tester.sftp.swt.in-dir=/opt/clearing/files/swt/importer/in -clearing-tester.sftp.swt.out-dir=/opt/clearing/files/swt/exporter/ -clearing-tester.sftp.dbf.importer.in-dir=/opt/clearing/files/dbf/importer/in -clearing-tester.sftp.dbf.importer.out-dir=/opt/clearing/files/dbf/importer/out -clearing-tester.sftp.dbf.exporter.out-dir=/opt/clearing/files/dbf/exporter/ +clearing-tester.sftp.swt.in-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/in +clearing-tester.sftp.swt.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/exporter/ +clearing-tester.sftp.dbf.importer.in-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/importer/in +clearing-tester.sftp.dbf.importer.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/importer/out +clearing-tester.sftp.dbf.exporter.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/exporter/ clearing-tester.sftp.user=user clearing-tester.sftp.password=Aa111111 clearing-tester.sftp.server-ip=sftp diff --git a/clr_test/clearing-all/settings/dbf-exporter/application.properties b/clr_test/clearing-all/settings/dbf-exporter/application.properties index c2d5731b3..0aa2748d6 100644 --- a/clr_test/clearing-all/settings/dbf-exporter/application.properties +++ b/clr_test/clearing-all/settings/dbf-exporter/application.properties @@ -7,11 +7,11 @@ export-dbf-service.hazelcast.password=dev-pass export-dbf-service.common.encoding=cp866 export-dbf-service.common.threads-count=10 -export-dbf-service.store.local-temp-dir=/opt/clearing/files/dbf/exporter/ +export-dbf-service.store.local-temp-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/exporter/ # код валюты должен быть в верхнем регистре, например для рублей - "RUB" (*.RUB=export/rub/).RUB=export/rub/ -export-dbf-service.store.out-pay-val-dir.RUB=/opt/clearing/files/dbf/exporter/ -export-dbf-service.store.out-pay-val-dir.EUR=/opt/clearing/files/dbf/exporter/ -export-dbf-service.store.out-pay-val-dir.CNY=/opt/clearing/files/dbf/exporter/ +export-dbf-service.store.out-pay-val-dir.RUB=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/exporter/ +export-dbf-service.store.out-pay-val-dir.EUR=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/exporter/ +export-dbf-service.store.out-pay-val-dir.CNY=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/exporter/ #export-dbf-service.store.user:tester #export-dbf-service.store.password=password #export-dbf-service.store.server-ip=10.230.238.53 diff --git a/clr_test/clearing-all/settings/dbf-importer/application.properties b/clr_test/clearing-all/settings/dbf-importer/application.properties index d938ccd89..ec1280367 100644 --- a/clr_test/clearing-all/settings/dbf-importer/application.properties +++ b/clr_test/clearing-all/settings/dbf-importer/application.properties @@ -3,9 +3,9 @@ spring.main.web-application-type=none import-dbf-service.scheduler.check-src-dir-cron=*/3 * * * * * import-dbf-service.store.delete-src-files=false -import-dbf-service.store.src-dir=/opt/clearing/files/dbf/importer/in -import-dbf-service.store.out-dir=/opt/clearing/files/dbf/importer/out/ -import-dbf-service.store.out-dir-error=/opt/clearing/files/dbf/importer/error/ +import-dbf-service.store.src-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/importer/in +import-dbf-service.store.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/importer/out/ +import-dbf-service.store.out-dir-error=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/importer/error/ import-dbf-service.common.encoding-source=cp866 import-dbf-service.common.insert-batch-size=100 diff --git a/clr_test/clearing-all/settings/swt-exporter/application.properties b/clr_test/clearing-all/settings/swt-exporter/application.properties index cf69aab1e..6bac9639a 100644 --- a/clr_test/clearing-all/settings/swt-exporter/application.properties +++ b/clr_test/clearing-all/settings/swt-exporter/application.properties @@ -7,7 +7,7 @@ export-swt-service.hazelcast.password=dev-pass export-swt-service.common.encoding=cp866 export-swt-service.common.threads-count=10 -export-swt-service.docOut=/opt/clearing/files/swt/exporter/ +export-swt-service.docOut=/builds/mfd/clearing/clr_test/clearing-all/files/swt/exporter/ export-swt-service.kafka-consumer.bootstrap-servers=kafka:9092 export-swt-service.kafka-consumer.group-id=dev-group-balance-service diff --git a/clr_test/clearing-all/settings/swt-importer/application.properties b/clr_test/clearing-all/settings/swt-importer/application.properties index 34c8cd019..12920cc71 100644 --- a/clr_test/clearing-all/settings/swt-importer/application.properties +++ b/clr_test/clearing-all/settings/swt-importer/application.properties @@ -5,12 +5,12 @@ spring.main.web-application-type=servlet import-swt-service.scheduler.check-src-dir-cron= */10 * * * * * import-swt-service.store.delete-src-files=false -import-swt-service.store.src-dir=/opt/clearing/files/swt/importer/in -import-swt-service.store.out-dir=/opt/clearing/files/swt/importer/out/ -import-swt-service.store.out-dir-error=/opt/clearing/files/swt/importer/error/ +import-swt-service.store.src-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/in +import-swt-service.store.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/out/ +import-swt-service.store.out-dir-error=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/error/ #sftpSrcDir -import-swt-service.store.sftp-in.sftp-src-dir=/opt/clearing/swt/in +import-swt-service.store.sftp-in.sftp-src-dir=/builds/mfd/clearing/clr_test/clearing-all/swt/in import-swt-service.store.sftp-in.user=user import-swt-service.store.sftp-in.password=********* import-swt-service.store.sftp-in.server-ip=127.0.0.1 diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index e7799b858..99df27834 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -12,7 +12,7 @@ def run_docker(folder_name): print(f"Running docker-compose for {folder_name}") os.chdir(CLR_TEST_DIR) #subprocess.call("docker compose down --volumes", shell=True) - subprocess.call("docker compose up --build --abort-on-container-exit --exit-code-from clearing_system", shell=True) + subprocess.call("docker compose up -V --build --abort-on-container-exit --exit-code-from clearing_system", shell=True) os.chdir("..")