treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.gitlab-ci.yml updated v52

Browse source
This commit is contained in:
Ivan Nikolaev-Axenov 2024-06-03 14:02:33 +03:00
parent 6f1ee644bf
commit e3c685f4b5
8 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clr_test/clearing-all/clearing_testing_utils/clearing-checker/application.properties
View file

@ -1,4 +1,4 @@
server.port=9902 server.port=9902
dbf-swt-checker.encoding=UTF-8 dbf-swt-checker.encoding=UTF-8
dbf-swt-checker.rootDir=/opt/clearing/clearing_testing_utils/clearing-checker/res/ dbf-swt-checker.rootDir=/builds/mfd/clearing/clr_test/clearing-all/clearing_testing_utils/clearing-checker/res/

2
clr_test/clearing-all/clearing_testing_utils/clearing-converter/application.properties
View file

@ -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 clearing-converter.encoding-source=cp866
server.port=9901 server.port=9901
server.servlet.context-path=/converter server.servlet.context-path=/converter

12
clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties
View file

@ -1,13 +1,13 @@
server.port=9900 server.port=9900
#local storage settings #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 #sftp storage settings
clearing-tester.sftp.swt.in-dir=/opt/clearing/files/swt/importer/in clearing-tester.sftp.swt.in-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/in
clearing-tester.sftp.swt.out-dir=/opt/clearing/files/swt/exporter/ clearing-tester.sftp.swt.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/exporter/
clearing-tester.sftp.dbf.importer.in-dir=/opt/clearing/files/dbf/importer/in 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=/opt/clearing/files/dbf/importer/out 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=/opt/clearing/files/dbf/exporter/ 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.user=user
clearing-tester.sftp.password=Aa111111 clearing-tester.sftp.password=Aa111111
clearing-tester.sftp.server-ip=sftp clearing-tester.sftp.server-ip=sftp

8
clr_test/clearing-all/settings/dbf-exporter/application.properties
View file

@ -7,11 +7,11 @@ export-dbf-service.hazelcast.password=dev-pass
export-dbf-service.common.encoding=cp866 export-dbf-service.common.encoding=cp866
export-dbf-service.common.threads-count=10 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/ # код валюты должен быть в верхнем регистре, например для рублей - "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.RUB=/builds/mfd/clearing/clr_test/clearing-all/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.EUR=/builds/mfd/clearing/clr_test/clearing-all/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.CNY=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/exporter/
#export-dbf-service.store.user:tester #export-dbf-service.store.user:tester
#export-dbf-service.store.password=password #export-dbf-service.store.password=password
#export-dbf-service.store.server-ip=10.230.238.53 #export-dbf-service.store.server-ip=10.230.238.53

6
clr_test/clearing-all/settings/dbf-importer/application.properties
View file

@ -3,9 +3,9 @@ spring.main.web-application-type=none
import-dbf-service.scheduler.check-src-dir-cron=*/3 * * * * * import-dbf-service.scheduler.check-src-dir-cron=*/3 * * * * *
import-dbf-service.store.delete-src-files=false import-dbf-service.store.delete-src-files=false
import-dbf-service.store.src-dir=/opt/clearing/files/dbf/importer/in import-dbf-service.store.src-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/importer/in
import-dbf-service.store.out-dir=/opt/clearing/files/dbf/importer/out/ import-dbf-service.store.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/dbf/importer/out/
import-dbf-service.store.out-dir-error=/opt/clearing/files/dbf/importer/error/ 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.encoding-source=cp866
import-dbf-service.common.insert-batch-size=100 import-dbf-service.common.insert-batch-size=100

2
clr_test/clearing-all/settings/swt-exporter/application.properties
View file

@ -7,7 +7,7 @@ export-swt-service.hazelcast.password=dev-pass
export-swt-service.common.encoding=cp866 export-swt-service.common.encoding=cp866
export-swt-service.common.threads-count=10 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.bootstrap-servers=kafka:9092
export-swt-service.kafka-consumer.group-id=dev-group-balance-service export-swt-service.kafka-consumer.group-id=dev-group-balance-service

8
clr_test/clearing-all/settings/swt-importer/application.properties
View file

@ -5,12 +5,12 @@ spring.main.web-application-type=servlet
import-swt-service.scheduler.check-src-dir-cron= */10 * * * * * import-swt-service.scheduler.check-src-dir-cron= */10 * * * * *
import-swt-service.store.delete-src-files=false import-swt-service.store.delete-src-files=false
import-swt-service.store.src-dir=/opt/clearing/files/swt/importer/in import-swt-service.store.src-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/in
import-swt-service.store.out-dir=/opt/clearing/files/swt/importer/out/ import-swt-service.store.out-dir=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/out/
import-swt-service.store.out-dir-error=/opt/clearing/files/swt/importer/error/ import-swt-service.store.out-dir-error=/builds/mfd/clearing/clr_test/clearing-all/files/swt/importer/error/
#sftpSrcDir #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.user=user
import-swt-service.store.sftp-in.password=********* import-swt-service.store.sftp-in.password=*********
import-swt-service.store.sftp-in.server-ip=127.0.0.1 import-swt-service.store.sftp-in.server-ip=127.0.0.1

2
clr_test/run_test_docker_containers.py
View file

@ -12,7 +12,7 @@ def run_docker(folder_name):
print(f"Running docker-compose for {folder_name}") print(f"Running docker-compose for {folder_name}")
os.chdir(CLR_TEST_DIR) os.chdir(CLR_TEST_DIR)
#subprocess.call("docker compose down --volumes", shell=True) #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("..") os.chdir("..")