From c27e377dbfcac730659f5f5fc0c0680fcfb24458 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Wed, 17 Jul 2024 15:45:42 +0300 Subject: [PATCH] .gitlab-ci.yml updated v117 --- clr_test/docker-compose.yml | 8 ++++---- clr_test/run_test_docker_containers.py | 28 +++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml index 98a53e771..a417e88e1 100644 --- a/clr_test/docker-compose.yml +++ b/clr_test/docker-compose.yml @@ -34,10 +34,10 @@ services: - "7020:7020" - "8080:8080" volumes: - - ./mnt/results:/opt/clearing/clearing_testing_utils/store/results - - ./mnt/logs/clearing:/opt/clearing/bin/log - - ./mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs - - ./mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs + - ${CI_PROJECT_DIR}/clr_test/mnt/results:/opt/clearing/clearing_testing_utils/store/results + - ${CI_PROJECT_DIR}/clr_test/mnt/logs/clearing:/opt/clearing/bin/log + - ${CI_PROJECT_DIR}/clr_test/mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs + - ${CI_PROJECT_DIR}/clr_test/mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs # restart: always zookeeper: diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index 84c6d9e18..af5e121d2 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -52,6 +52,31 @@ def remove_files_with_extensions(extension): os.remove(os.path.join(root, currentFile)) +def run_first(): + logging.info(f"$CI_PROJECT_DIR = {os.environ['CI_PROJECT_DIR']}") + 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") + change_date(folders[0]) + run_docker(folders[0]) + + def main(): folders = [i for i in sorted(os.listdir(DATA_ROOT_DIR)) if re.search("\\d{1,}.\\d{1,}.*", i)] @@ -79,4 +104,5 @@ def main(): if __name__=='__main__': - main() + run_first() + # main()