From 4a90d75cb3bf032ddb25501d5772aa737ff7cb8a Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Mon, 1 Jul 2024 15:50:15 +0300 Subject: [PATCH] .gitlab-ci.yml updated v72 --- .gitlab-ci.yml | 6 +++--- clr_test/clearing-all/launch_and_test.sh | 1 + clr_test/docker-compose.yml | 13 ++++++------- clr_test/mnt/logs/clearing/.gitkeep | 0 clr_test/mnt/logs/converter/.gitkeep | 0 clr_test/mnt/logs/tester/.gitkeep | 0 clr_test/mnt/results/.gitkeep | 0 clr_test/run_test_docker_containers.py | 17 +++++++++++++++++ 8 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 clr_test/mnt/logs/clearing/.gitkeep create mode 100644 clr_test/mnt/logs/converter/.gitkeep create mode 100644 clr_test/mnt/logs/tester/.gitkeep create mode 100644 clr_test/mnt/results/.gitkeep diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c82f88f8d..0005f4a94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,8 +46,8 @@ test: paths: - /builds/mfd/clearing/clr_test/result-files script: - - apk update && apk add maven python3 + - echo "Installing maven and python" && apk update && apk add maven python3 - cd clr_test - - cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin - - cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db + - echo "Copying jar files to clearing-all/bin" && cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin + - echo "Copying DDL.sql to db directory" && cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db - python3 run_test_docker_containers.py diff --git a/clr_test/clearing-all/launch_and_test.sh b/clr_test/clearing-all/launch_and_test.sh index b8774e1b3..6170c6205 100644 --- a/clr_test/clearing-all/launch_and_test.sh +++ b/clr_test/clearing-all/launch_and_test.sh @@ -11,6 +11,7 @@ sleep 180 echo Run test case sh ./clearing_testing_utils/run_test_env.sh +sleep 30 echo Run clearing-tester sh ./clearing_testing_utils/clearing-tester/clearing-tester.sh diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml index adf115389..d80bca13f 100644 --- a/clr_test/docker-compose.yml +++ b/clr_test/docker-compose.yml @@ -34,7 +34,12 @@ services: - "7020:7020" - "8080:8080" volumes: - - test-files:/opt/clearing/clearing_testing_utils/store/results + - /root/clr_test/mnt:/opt/clearing/files + - /root/clr_test/mnt/results:/opt/clearing/clearing_testing_utils/store/results + - /root/clr_test/mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs + - /root/clr_test/mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs + - /root/clr_test/mnt/logs/clearing:/opt/clearing/bin/log + - /root/clr_test/mnt/testFiles:/opt/clearing/clearing_testing_utils/store/results # restart: always zookeeper: @@ -81,12 +86,6 @@ services: volumes: db: driver: local - test-files: - driver: local - driver_opts: - type: none - o: bind - device: /root/clr_test/mnt/testFiles zookeeper_data: driver: local kafka_data: diff --git a/clr_test/mnt/logs/clearing/.gitkeep b/clr_test/mnt/logs/clearing/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/clr_test/mnt/logs/converter/.gitkeep b/clr_test/mnt/logs/converter/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/clr_test/mnt/logs/tester/.gitkeep b/clr_test/mnt/logs/tester/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/clr_test/mnt/results/.gitkeep b/clr_test/mnt/results/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index fb80d2e98..bbc6d54ed 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -3,6 +3,10 @@ import re import time import shutil import subprocess +import logging + + +logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s] %(message)s") DATA_ROOT_DIR = os.environ['CLEARING_TEST_DIR'] @@ -26,16 +30,29 @@ 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): + logging.info(f"Removing file {os.path.join(root, currentFile)}, based on extension {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)] + + logging.info(f"Removing folder {CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store/expected") shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store/expected") + + logging.info(f"Removing folder {CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store/input") shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store/input") + + logging.info(f"Removing file {CLR_TEST_DIR}/db/export.sql") os.remove(f"{CLR_TEST_DIR}/db/export.sql") + + logging.info(f"Removing file {CLR_TEST_DIR}/db/test-data.sql") os.remove(f"{CLR_TEST_DIR}/db/test-data.sql") + + logging.info(f"Copying files from {DATA_ROOT_DIR}/{folders[0]}/db/ to {CLR_TEST_DIR}/db/") shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/db/", f"{CLR_TEST_DIR}/db/", dirs_exist_ok=True) + + logging.info(f"Copying files from {DATA_ROOT_DIR}/{folders[0]}/clearing_testing_utils/ to {CLR_TEST_DIR}/clearing-all/clearing_testing_utils/") shutil.copytree(f"{DATA_ROOT_DIR}/{folders[0]}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/", dirs_exist_ok=True) remove_files_with_extensions(".xml") run_docker(folders[0], read_date(folders[0]))