.gitlab-ci.yml updated v69

.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

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

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}

clr_test/qemu-alpine/docker-compose.yml

@@ -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

clr_test/qemu-alpine/mounted/qemu.mac

@@ -1 +0,0 @@
-02:4F:33:36:F2:7A

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")