.gitlab-ci.yml updated v16

.gitlab-ci.yml

@@ -14,8 +14,7 @@ build:
   image: ${DOCKER_PROXY}/maven:latest
   stage: build
   script:
-#    - mvn clean package -DskipTests -Pdistributive
-    - mvn --version
+    - mvn clean package -DskipTests -Pdistributive
   artifacts:
     name: "$CI_COMMIT_REF_NAME"
     paths:
@@ -25,8 +24,5 @@ test:
   stage: test
   script:
     - cd clr_test
-    - pwd
-    - ls -la
-    - ls -la ./clearing-all/db
     - docker-compose down --volumes
     - docker compose up --build --force-recreate --abort-on-container-exit --exit-code-from clearing_system

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 ./bin $CLEARING_HOME_BIN
-ADD ./settings $CLEARING_HOME/settings
+ADD ../../z-distr/target/clearing/bin $CLEARING_HOME_BIN
+ADD ../../z-distr/target/clearing/settings $CLEARING_HOME/settings
 
 ADD ./kill_all.sh $CLEARING_HOME/kill_all.sh
 ADD ./launch_all.sh $CLEARING_HOME/launch_all.sh

clr_test/clearing-all/db/Dockerfile

@@ -1,5 +1,5 @@
 FROM mirror.gcr.io/postgres:14.1-alpine
 
-ADD DDL.sql /docker-entrypoint-initdb.d/
+ADD ../../z-distr/target/clearing/db/DDL.sql /docker-entrypoint-initdb.d/
 ADD export.sql /docker-entrypoint-initdb.d/
 ADD test-data.sql /docker-entrypoint-initdb.d/

clr_test/clearing-all/settings/backend-api/application.properties

@@ -1,28 +0,0 @@
-server.port=8080
-server.servlet.context-path=/backend-api
-server.ssl.key-store-type=PKCS12
-server.ssl.key-store=classpath:keystore/client.p12
-server.ssl.key-store-password=********
-server.ssl.enabled=false
-spring.main.web-application-type=servlet
-backend-api.security.authorization-disabled=true
-backend-api.example-setting=test
-backend-api.hazelcast.cluster-members=127.0.0.1:5701
-backend-api.hazelcast.login=dev
-backend-api.hazelcast.password=dev-pass
-#backend-api.hazelcast-search.cluster-members=127.0.0.1:5702
-#backend-api.hazelcast-search.login=dev-hist
-#backend-api.hazelcast-search.password=dev-pass-hist
-backend-api.kafka-producer.bootstrap-servers=kafka:9092
-backend-api.kafka-producer.acks=all
-backend-api.kafka-producer.retries=0
-backend-api.kafka-producer.batch-size=16384
-backend-api.kafka-producer.linger-ms=1
-backend-api.kafka-producer.buffer-memory=33554432
-backend-api.kafka-consumer.bootstrap-servers=kafka:9092
-backend-api.kafka-consumer.group-id=dev-group-backend-api
-backend-api.kafka-consumer.enable-auto-commit=true
-backend-api.kafka-consumer.session-timeout-ms=30000
-backend-api.kafka-consumer.auto-offset-reset=latest
-backend-api.kafka-consumer.linger-ms=1
-backend-api.kafka-consumer.buffer-memory=33554432

clr_test/clearing-all/settings/backend-api/keycloak.json

@@ -1,29 +0,0 @@
-{
-  "realm" : "master",
-  "resource" : "clearing",
-  "auth-server-url" : "http://10.200.200.147:8080",
-  "ssl-required" : "none",
-  "use-resource-role-mappings" : false,
-  "enable-cors" : true,
-  "cors-max-age" : 1000,
-  "cors-allowed-methods" : "POST, PUT, DELETE, GET",
-  "cors-exposed-headers" : "WWW-Authenticate",
-  "bearer-only" : true,
-  "enable-basic-auth" : false,
-  "expose-token" : false,
-  "verify-token-audience" : false,
-  "credentials" : {
-    "secret" : "WnOVCxcAmrUYc8IjiFHOuRif5Oesoyfr"
-  },
-
-  "connection-pool-size" : 20,
-  "socket-timeout-millis" : 5000,
-  "connection-timeout-millis" : 6000,
-  "connection-ttl-millis" : 500,
-  "disable-trust-manager" : false,
-  "allow-any-hostname" : false,
-
-  "token-minimum-time-to-live" : 0,
-  "min-time-between-jwks-requests" : 10,
-  "public-key-cache-ttl" : 86400
-}

clr_test/clearing-all/settings/clearing-service/application.properties

@@ -1,24 +0,0 @@
-spring.main.web-application-type=none
-
-clearing-service.hazelcast.cluster-members=127.0.0.1:5701
-clearing-service.hazelcast.login=dev
-clearing-service.hazelcast.password=dev-pass
-
-clearing-service.kafka-consumer.bootstrap-servers=kafka:9092
-clearing-service.kafka-consumer.group-id=dev-group-clearing-service
-clearing-service.kafka-consumer.enable-auto-commit=false
-clearing-service.kafka-consumer.session-timeout-ms=30000
-clearing-service.kafka-consumer.auto-offset-reset=latest
-clearing-service.kafka-consumer.linger-ms=1
-clearing-service.kafka-consumer.buffer-memory=33554432
-
-clearing-service.kafka-producer.bootstrap-servers=kafka:9092
-clearing-service.kafka-producer.acks=all
-clearing-service.kafka-producer.retries=0
-clearing-service.kafka-producer.batch-size=16384
-clearing-service.kafka-producer.linger-ms=1
-clearing-service.kafka-producer.buffer-memory=33554432
-
-clearing-service.session-stage.inspection-gateway-timeout=60
-
-clearing-service.scheduler.check-payment-instruction=*/5 * * * * *

clr_test/clearing-all/settings/dbf-exporter/application.properties

@@ -1,33 +0,0 @@
-spring.main.web-application-type=none
-
-export-dbf-service.hazelcast.cluster-members=localhost:5701
-export-dbf-service.hazelcast.login=dev
-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/
-# код валюты должен быть в верхнем регистре, например для рублей - "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.user:tester
-#export-dbf-service.store.password=password
-#export-dbf-service.store.server-ip=10.230.238.53
-#export-dbf-service.store.server-port=2222
-
-export-dbf-service.kafka-consumer.bootstrap-servers=kafka:9092
-export-dbf-service.kafka-consumer.group-id=dev-group-balance-service
-export-dbf-service.kafka-consumer.enable-auto-commit=false
-export-dbf-service.kafka-consumer.session-timeout-ms=30000
-export-dbf-service.kafka-consumer.auto-offset-reset=latest
-export-dbf-service.kafka-consumer.linger-ms=1
-export-dbf-service.kafka-consumer.buffer-memory=33554432
-
-export-dbf-service.kafka-producer.bootstrap-servers=kafka:9092
-export-dbf-service.kafka-producer.acks=all
-export-dbf-service.kafka-producer.retries=0
-export-dbf-service.kafka-producer.batch-size=16384
-export-dbf-service.kafka-producer.linger-ms=1
-export-dbf-service.kafka-producer.buffer-memory=33554432

clr_test/clearing-all/settings/dbf-importer/application.properties

@@ -1,41 +0,0 @@
-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.common.encoding-source=cp866
-import-dbf-service.common.insert-batch-size=100
-import-dbf-service.common.threads-count=10
-
-#sftpSrcDir
-import-dbf-service.store.sftp-in.sftp-src-pay-val-dir.rub=clearing_importer_sftp/rub/
-import-dbf-service.store.sftp-in.sftp-src-pay-val-dir.eur=clearing_importer_sftp/eur/
-import-dbf-service.store.sftp-in.sftp-src-dir=clearing_importer_sftp
-import-dbf-service.store.sftp-in.user=user
-import-dbf-service.store.sftp-in.password=Aa111111
-import-dbf-service.store.sftp-in.server-ip=sftp
-import-dbf-service.store.sftp-in.server-port=22
-
-import-dbf-service.hazelcast.cluster-members=localhost:5701
-import-dbf-service.hazelcast.login=dev
-import-dbf-service.hazelcast.password=dev-pass
-
-
-import-dbf-service.kafka-producer.bootstrap-servers=kafka:9092
-import-dbf-service.kafka-producer.acks=all
-import-dbf-service.kafka-producer.retries=0
-import-dbf-service.kafka-producer.batch-size=16384
-import-dbf-service.kafka-producer.linger-ms=1
-import-dbf-service.kafka-producer.buffer-memory=33554432
-
-import-dbf-service.kafka-consumer.bootstrap-servers=kafka:9092
-import-dbf-service.kafka-consumer.group-id=dev-group-clearing-service
-import-dbf-service.kafka-consumer.enable-auto-commit=false
-import-dbf-service.kafka-consumer.session-timeout-ms=30000
-import-dbf-service.kafka-consumer.auto-offset-reset=latest
-import-dbf-service.kafka-consumer.linger-ms=1
-import-dbf-service.kafka-consumer.buffer-memory=33554432

clr_test/clearing-all/settings/imdg/application.properties

@@ -1,13 +0,0 @@
-imdg.hazelcast.listenPort=5701
-imdg.hazelcast.login=dev
-imdg.hazelcast.password=dev-pass
-imdg.hazelcast.cluster-members[0]=127.0.0.1
-imdg.hazelcast.backup-count=3
-imdg.hazelcast.instance-name=instance
-imdg.hazelcast.db-sync-seconds=10
-imdg.database.login=clearing
-imdg.database.password=Aa111111
-imdg.database.url=jdbc:postgresql://db:5432/clearing
-#imdg.database.url=jdbc:postgresql://10.200.200.133:5432/postgres?currentSchema=clearing_tester
-imdg.database.min-pool-size=10
-imdg.database.max-pool-size=30

clr_test/clearing-all/settings/registry-service/application.properties

@@ -1,29 +0,0 @@
-spring.main.web-application-type=none
-
-registry-service.hazelcast.cluster-members=127.0.0.1:5701
-registry-service.hazelcast.login=dev
-registry-service.hazelcast.password=dev-pass
-
-registry-service.kafka-consumer.bootstrap-servers=kafka:9092
-registry-service.kafka-consumer.group-id=dev-group-registry-service
-registry-service.kafka-consumer.enable-auto-commit=true
-registry-service.kafka-consumer.session-timeout-ms=30000
-registry-service.kafka-consumer.auto-offset-reset=latest
-registry-service.kafka-consumer.linger-ms=1
-registry-service.kafka-consumer.buffer-memory=33554432
-
-registry-service.kafka-producer.bootstrap-servers=kafka:9092
-registry-service.kafka-producer.acks=all
-registry-service.kafka-producer.retries=0
-registry-service.kafka-producer.batch-size=16384
-registry-service.kafka-producer.linger-ms=1
-registry-service.kafka-producer.buffer-memory=33554432
-
-registry-service.csv-mode=true
-registry-service.reports-store.local-temp-dir=./reports_out_temp
-registry-service.reports-store.out-dir=reports
-registry-service.reports-store.user=tester
-registry-service.reports-store.password=password
-registry-service.reports-store.server-ip=10.230.238.53
-registry-service.reports-store.server-port=2222
-registry-service.reports-store.delete-after-send=true

clr_test/clearing-all/settings/scheduler-service/application.properties

@@ -1,17 +0,0 @@
-spring.main.web-application-type=none
-scheduler-service.hazelcast.cluster-members=127.0.0.1:5701
-scheduler-service.hazelcast.login=dev
-scheduler-service.hazelcast.password=dev-pass
-scheduler-service.kafka-consumer.bootstrap-servers=kafka:9092
-scheduler-service.kafka-consumer.group-id=dev-group-scheduler-service
-scheduler-service.kafka-consumer.enable-auto-commit=true
-scheduler-service.kafka-consumer.session-timeout-ms=30000
-scheduler-service.kafka-consumer.auto-offset-reset=latest
-scheduler-service.kafka-consumer.linger-ms=1
-scheduler-service.kafka-consumer.buffer-memory=33554432
-scheduler-service.kafka-producer.bootstrap-servers=kafka:9092
-scheduler-service.kafka-producer.acks=all
-scheduler-service.kafka-producer.retries=0
-scheduler-service.kafka-producer.batch-size=16384
-scheduler-service.kafka-producer.linger-ms=1
-scheduler-service.kafka-producer.buffer-memory=33554432

clr_test/clearing-all/settings/swt-exporter/application.properties

@@ -1,31 +0,0 @@
-spring.main.web-application-type=none
-
-export-swt-service.hazelcast.cluster-members=localhost:5701
-export-swt-service.hazelcast.login=dev
-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.kafka-consumer.bootstrap-servers=kafka:9092
-export-swt-service.kafka-consumer.group-id=dev-group-balance-service
-export-swt-service.kafka-consumer.enable-auto-commit=false
-export-swt-service.kafka-consumer.session-timeout-ms=30000
-export-swt-service.kafka-consumer.auto-offset-reset=latest
-export-swt-service.kafka-consumer.linger-ms=1
-export-swt-service.kafka-consumer.buffer-memory=33554432
-
-export-swt-service.kafka-producer.bootstrap-servers=kafka:9092
-export-swt-service.kafka-producer.acks=all
-export-swt-service.kafka-producer.retries=0
-export-swt-service.kafka-producer.batch-size=16384
-export-swt-service.kafka-producer.linger-ms=1
-export-swt-service.kafka-producer.buffer-memory=33554432
-
-export-swt-service.sftp-out.sftp-out-dir=swt_out_sftp_directory
-export-swt-service.sftp-out.user=user
-export-swt-service.sftp-out.password=********
-export-swt-service.sftp-out.server-ip=127.0.0.1
-export-swt-service.sftp-out.server-port=22

clr_test/clearing-all/settings/swt-importer/application.properties

@@ -1,41 +0,0 @@
-server.port=7117
-server.servlet.context-path=/importer-swt
-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/
-
-#sftpSrcDir
-import-swt-service.store.sftp-in.sftp-src-dir=/opt/clearing/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
-import-swt-service.store.sftp-in.server-port=22
-
-import-swt-service.common.encoding-source=cp866
-import-swt-service.common.insert-batch-size=100
-import-swt-service.common.threads-count=10
-
-import-swt-service.hazelcast.cluster-members=localhost:5701
-import-swt-service.hazelcast.login=dev
-import-swt-service.hazelcast.password=dev-pass
-
-
-import-swt-service.kafka-producer.bootstrap-servers=kafka:9092
-import-swt-service.kafka-producer.acks=all
-import-swt-service.kafka-producer.retries=0
-import-swt-service.kafka-producer.batch-size=16384
-import-swt-service.kafka-producer.linger-ms=1
-import-swt-service.kafka-producer.buffer-memory=33554432
-
-import-swt-service.kafka-consumer.bootstrap-servers=kafka:9092
-import-swt-service.kafka-consumer.group-id=dev-group-clearing-service
-import-swt-service.kafka-consumer.enable-auto-commit=false
-import-swt-service.kafka-consumer.session-timeout-ms=30000
-import-swt-service.kafka-consumer.auto-offset-reset=latest
-import-swt-service.kafka-consumer.linger-ms=1
-import-swt-service.kafka-consumer.buffer-memory=33554432