diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c54a2a3f..a090fa7df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,15 +39,14 @@ test: stage: test variables: CLEARING_TEST_DIR: "/builds/mfd/clearing/clearing_test" - CLR_TEST_DIR: "/builds/mfd/clearing/clr_test/clearing-docker-compose" - QEMU_ALPINE_DIR: "/builds/mfd/clearing/clr_test/qemu-alpine" + CLR_TEST_DIR: "/builds/mfd/clearing/clr_test" RESULT_FILES_DIR: "/builds/mfd/clearing/clr_test/result-files" artifacts: name: "$CI_COMMIT_REF_NAME" paths: - /builds/mfd/clearing/clr_test/result-files script: - - apk update && apk add maven python3 openssh + - apk update && apk add maven python3 - cd clr_test - cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-docker-compose/clearing-all/bin - cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./clearing-docker-compose/db diff --git a/clr_test/clearing-docker-compose/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile similarity index 88% rename from clr_test/clearing-docker-compose/clearing-all/Dockerfile rename to clr_test/clearing-all/Dockerfile index 2335fd5a9..cbf51bf73 100644 --- a/clr_test/clearing-docker-compose/clearing-all/Dockerfile +++ b/clr_test/clearing-all/Dockerfile @@ -28,6 +28,10 @@ RUN mkdir -p $CLEARING_HOME/files/dbf/importer/in RUN mkdir -p $CLEARING_HOME/files/dbf/importer/out RUN mkdir -p $CLEARING_HOME/files/dbf/importer/error RUN mkdir -p $CLEARING_HOME/files/dbf/exporter +RUN mkdir -p $CLEARING_HOME/files/xml/importer/in +RUN mkdir -p $CLEARING_HOME/files/xml/importer/out +RUN mkdir -p $CLEARING_HOME/files/xml/importer/error +RUN mkdir -p $CLEARING_HOME/files/xml/exporter WORKDIR $CLEARING_HOME RUN sed -i 's/\r$//' $CLEARING_HOME/*.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/application.properties b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/application.properties rename to clr_test/clearing-all/clearing_testing_utils/clearing-checker/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh rename to clr_test/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/dbf-swt-checker-1.0.jar b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/dbf-swt-checker-1.0.jar similarity index 90% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/dbf-swt-checker-1.0.jar rename to clr_test/clearing-all/clearing_testing_utils/clearing-checker/dbf-swt-checker-1.0.jar index a738a1ebc..467c7eb73 100644 Binary files a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-checker/dbf-swt-checker-1.0.jar and b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/dbf-swt-checker-1.0.jar differ diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/application.properties b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/application.properties rename to clr_test/clearing-all/clearing_testing_utils/clearing-converter/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh rename to clr_test/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar similarity index 90% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar rename to clr_test/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar index 54caf5140..d0f1e0d70 100644 Binary files a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar and b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar differ diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/README.md b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/README.md similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/README.md rename to clr_test/clearing-all/clearing_testing_utils/clearing-tester/README.md diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/application.properties b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties similarity index 74% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/application.properties rename to clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties index b318eda4c..9efb508c5 100644 --- a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/application.properties +++ b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties @@ -3,11 +3,17 @@ server.port=9900 clearing-tester.store.root-dir=/opt/clearing/clearing_testing_utils/store #sftp storage settings -clearing-tester.sftp.swt.in-dir=/opt/clearing/files/swt/importer/in +clearing-tester.sftp.swt.in-dir=/opt/clearing/files/swt/importer/out 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.dbf.exporter.out-dir=/opt/clearing/files/dbf/exporter + +clearing-tester.sftp.xml.importer.in-dir=/opt/clearing/files/xml/importer/in +clearing-tester.sftp.xml.importer.out-dir=/opt/clearing/files/xml/importer/out +clearing-tester.sftp.xml.exporter.out-dir=/opt/clearing/files/xml/exporter + clearing-tester.sftp.user=user clearing-tester.sftp.password=Aa111111 clearing-tester.sftp.server-ip=sftp @@ -21,11 +27,23 @@ clearing-tester.type-of-conversion=DBF-OK #converter service url clearing-tester.checker-url=http://localhost:9902/api/checkFiles +#mock dates settings +#clearing-tester.mock-date-for-sdf=2024-01-20 +#clearing-tester.mock-date-for-execution=2023-01-25 +#clearing-tester.mock-date-for-sdf= +#clearing-tester.mock-date-for-execution= + + #hazelcast settings clearing-tester.hazelcast.cluster-members=127.0.0.1:5701 clearing-tester.hazelcast.login=dev clearing-tester.hazelcast.password=dev-pass +#database settings +clearing-tester.database.url=jdbc:postgresql://db:5432/clearing +clearing-tester.database.login=clearing +clearing-tester.database.password=Aa111111 + #common settings clearing-tester.common.encoding-source=cp866 clearing-tester.common.insert-batch-size=100 @@ -47,5 +65,5 @@ clearing-tester.kafka-consumer.auto-offset-reset=latest clearing-tester.kafka-consumer.linger-ms=1 clearing-tester.kafka-consumer.buffer-memory=33554432 -clearing-tester.common.session-type=${session_type:CURR} +clearing-tester.common.session-type=${session_type:TRDT} clearing-tester.common.section=${section:FOND} \ No newline at end of file diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar similarity index 82% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar rename to clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar index 8d9e547df..abbfcfcfe 100644 Binary files a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar and b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar differ diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.sh b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.sh rename to clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/kill_test_all.sh b/clr_test/clearing-all/clearing_testing_utils/kill_test_all.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/kill_test_all.sh rename to clr_test/clearing-all/clearing_testing_utils/kill_test_all.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/restart_test_all.sh b/clr_test/clearing-all/clearing_testing_utils/restart_test_all.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/restart_test_all.sh rename to clr_test/clearing-all/clearing_testing_utils/restart_test_all.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/run_test_env.sh b/clr_test/clearing-all/clearing_testing_utils/run_test_env.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/run_test_env.sh rename to clr_test/clearing-all/clearing_testing_utils/run_test_env.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/store/expected/.gitkeep b/clr_test/clearing-all/clearing_testing_utils/store/expected/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/store/expected/.gitkeep rename to clr_test/clearing-all/clearing_testing_utils/store/expected/.gitkeep diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/store/input/.gitkeep b/clr_test/clearing-all/clearing_testing_utils/store/input/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/store/input/.gitkeep rename to clr_test/clearing-all/clearing_testing_utils/store/input/.gitkeep diff --git a/clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/store/results/.gitkeep b/clr_test/clearing-all/clearing_testing_utils/store/results/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/clearing_testing_utils/store/results/.gitkeep rename to clr_test/clearing-all/clearing_testing_utils/store/results/.gitkeep diff --git a/clr_test/clearing-docker-compose/clearing-all/files/dbf/in/.gitkeep b/clr_test/clearing-all/files/dbf/in/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/files/dbf/in/.gitkeep rename to clr_test/clearing-all/files/dbf/in/.gitkeep diff --git a/clr_test/clearing-docker-compose/clearing-all/files/dbf/out/.gitkeep b/clr_test/clearing-all/files/dbf/out/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/files/dbf/out/.gitkeep rename to clr_test/clearing-all/files/dbf/out/.gitkeep diff --git a/clr_test/clearing-docker-compose/clearing-all/files/swt/in/.gitkeep b/clr_test/clearing-all/files/swt/in/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/files/swt/in/.gitkeep rename to clr_test/clearing-all/files/swt/in/.gitkeep diff --git a/clr_test/clearing-docker-compose/clearing-all/files/swt/out/.gitkeep b/clr_test/clearing-all/files/swt/out/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/files/swt/out/.gitkeep rename to clr_test/clearing-all/files/swt/out/.gitkeep diff --git a/clr_test/clearing-docker-compose/mnt/testFiles/.gitkeep b/clr_test/clearing-all/files/xml/in/.gitkeep similarity index 100% rename from clr_test/clearing-docker-compose/mnt/testFiles/.gitkeep rename to clr_test/clearing-all/files/xml/in/.gitkeep diff --git a/clr_test/clearing-all/files/xml/out/.gitkeep b/clr_test/clearing-all/files/xml/out/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/clr_test/clearing-docker-compose/clearing-all/kill_all.sh b/clr_test/clearing-all/kill_all.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/kill_all.sh rename to clr_test/clearing-all/kill_all.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/launch_all.sh b/clr_test/clearing-all/launch_all.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/launch_all.sh rename to clr_test/clearing-all/launch_all.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/launch_and_test.sh b/clr_test/clearing-all/launch_and_test.sh similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/launch_and_test.sh rename to clr_test/clearing-all/launch_and_test.sh diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/backend-api/application.properties b/clr_test/clearing-all/settings/backend-api/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/backend-api/application.properties rename to clr_test/clearing-all/settings/backend-api/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/backend-api/keycloak.json b/clr_test/clearing-all/settings/backend-api/keycloak.json similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/backend-api/keycloak.json rename to clr_test/clearing-all/settings/backend-api/keycloak.json diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/backend-api/meta.json b/clr_test/clearing-all/settings/backend-api/meta.json similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/backend-api/meta.json rename to clr_test/clearing-all/settings/backend-api/meta.json diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/clearing-service/application.properties b/clr_test/clearing-all/settings/clearing-service/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/clearing-service/application.properties rename to clr_test/clearing-all/settings/clearing-service/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/dbf-exporter/application.properties b/clr_test/clearing-all/settings/dbf-exporter/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/dbf-exporter/application.properties rename to clr_test/clearing-all/settings/dbf-exporter/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/dbf-importer/application.properties b/clr_test/clearing-all/settings/dbf-importer/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/dbf-importer/application.properties rename to clr_test/clearing-all/settings/dbf-importer/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/imdg/application.properties b/clr_test/clearing-all/settings/imdg/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/imdg/application.properties rename to clr_test/clearing-all/settings/imdg/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/registry-service/application.properties b/clr_test/clearing-all/settings/registry-service/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/registry-service/application.properties rename to clr_test/clearing-all/settings/registry-service/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/scheduler-service/application.properties b/clr_test/clearing-all/settings/scheduler-service/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/scheduler-service/application.properties rename to clr_test/clearing-all/settings/scheduler-service/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/swt-exporter/application.properties b/clr_test/clearing-all/settings/swt-exporter/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/swt-exporter/application.properties rename to clr_test/clearing-all/settings/swt-exporter/application.properties diff --git a/clr_test/clearing-docker-compose/clearing-all/settings/swt-importer/application.properties b/clr_test/clearing-all/settings/swt-importer/application.properties similarity index 100% rename from clr_test/clearing-docker-compose/clearing-all/settings/swt-importer/application.properties rename to clr_test/clearing-all/settings/swt-importer/application.properties diff --git a/clr_test/clearing-docker-compose/db/Dockerfile b/clr_test/db/Dockerfile similarity index 100% rename from clr_test/clearing-docker-compose/db/Dockerfile rename to clr_test/db/Dockerfile diff --git a/clr_test/clearing-docker-compose/db/export.sql b/clr_test/db/export.sql similarity index 100% rename from clr_test/clearing-docker-compose/db/export.sql rename to clr_test/db/export.sql diff --git a/clr_test/clearing-docker-compose/db/test-data.sql b/clr_test/db/test-data.sql similarity index 100% rename from clr_test/clearing-docker-compose/db/test-data.sql rename to clr_test/db/test-data.sql diff --git a/clr_test/clearing-docker-compose/docker-compose.yml b/clr_test/docker-compose.yml similarity index 100% rename from clr_test/clearing-docker-compose/docker-compose.yml rename to clr_test/docker-compose.yml diff --git a/clr_test/mnt/testFiles/.gitkeep b/clr_test/mnt/testFiles/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/clr_test/qemu-alpine/data.qcow2 b/clr_test/qemu-alpine/data.qcow2 deleted file mode 100644 index 65a043a4c..000000000 Binary files a/clr_test/qemu-alpine/data.qcow2 and /dev/null differ diff --git a/clr_test/qemu-alpine/docker-compose.yml b/clr_test/qemu-alpine/docker-compose.yml deleted file mode 100644 index 32c1c275d..000000000 --- a/clr_test/qemu-alpine/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -services: - qemu: - container_name: qemu - image: qemux/qemu-docker - environment: - BOOT: - RAM_SIZE: "4G" - devices: - - /dev/kvm - cap_add: - - NET_ADMIN - ports: - - 8006:8006 - - 2233:22 - stop_grace_period: 2m - volumes: - - ./mounted:/storage \ No newline at end of file diff --git a/clr_test/qemu-alpine/mounted/qemu.mac b/clr_test/qemu-alpine/mounted/qemu.mac deleted file mode 100644 index 4923d98f1..000000000 --- a/clr_test/qemu-alpine/mounted/qemu.mac +++ /dev/null @@ -1 +0,0 @@ -02:4F:33:36:F2:7A diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index 83428c5b3..fb80d2e98 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -7,20 +7,14 @@ import subprocess DATA_ROOT_DIR = os.environ['CLEARING_TEST_DIR'] CLR_TEST_DIR = os.environ['CLR_TEST_DIR'] -QEMU_ALPINE_DIR = os.environ['QEMU_ALPINE_DIR'] RESULT_FILES_DIR = os.environ['RESULT_FILES_DIR'] def run_docker(folder_name, date): print(f"Running docker-compose for {folder_name}") - os.chdir(QEMU_ALPINE_DIR) - subprocess.call('docker compose up -d', shell=True) - time.sleep(3) - subprocess.call('scp -P 2233 -r ../clearing-docker-compose root@localhost:/root/clr_test', shell=True) - subprocess.call(f"ssh root@localhost -p 2222 -t \'cd clr_test; docker compose pull; docker compose build; date --set \"{date} 00:00:00\"; docker compose up --abort-on-container-exit --exit-code-from clearing_system'", shell=True) - subprocess.call(f"scp -P 2233 -r root@localhost:/root/clr_test/mnt/testFiles {RESULT_FILES_DIR}", shell=True) - os.remove(f"{QEMU_ALPINE_DIR}/mounted/data.qcow2") - os.chdir("..") + subprocess.call('docker compose pull', shell=True) + subprocess.call('docker compose build', shell=True) + subprocess.call('docker compose up --abort-on-container-exit --exit-code-from clearing_system', shell=True) def read_date(folder_name): @@ -28,6 +22,13 @@ def read_date(folder_name): return f.read() +def remove_files_with_extensions(extension): + for root, dirs, files in os.walk(CLR_TEST_DIR): + for currentFile in files: + if currentFile.lower().endswith(extension): + os.remove(os.path.join(root, currentFile)) + + def main(): folders = [i for i in sorted(os.listdir(DATA_ROOT_DIR)) if re.search("\\d{1,}.\\d{1,}.*", i)] shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store/expected") @@ -36,7 +37,7 @@ def main(): os.remove(f"{CLR_TEST_DIR}/db/test-data.sql") shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/db/", f"{CLR_TEST_DIR}/db/", dirs_exist_ok=True) shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/", dirs_exist_ok=True) - shutil.copy2(f"{QEMU_ALPINE_DIR}/data.qcow2", f"{QEMU_ALPINE_DIR}/mounted") + remove_files_with_extensions(".xml") run_docker(folders[0], read_date(folders[0])) # for folder in folders: # shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store")