diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties index 950f31ca0..74ce7c37d 100644 --- a/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties +++ b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties @@ -3,21 +3,18 @@ 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.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.swt.importer.in-dir=/opt/clearing/files/swt/importer/in +clearing-tester.sftp.swt.importer.out-dir=/opt/clearing/files/swt/importer/out +clearing-tester.sftp.swt.exporter.out-dir=/opt/clearing/files/swt/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 -#mock dates settings -clearing-tester.mock-date-for-sdf=2024-07-22 -clearing-tester.mock-date-for-execution=2024-07-22 - clearing-tester.sftp.user=user clearing-tester.sftp.password=Aa111111 clearing-tester.sftp.server-ip=sftp @@ -34,9 +31,6 @@ 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 diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar index 5ccec09af..fc3839f42 100644 Binary files a/clr_test/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/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index 84c6d9e18..db901ca24 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_specific(index): + 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[index]}/db/ to {CLR_TEST_DIR}/db/") + shutil.copytree(f"{DATA_ROOT_DIR}/{folders[index]}/db/", f"{CLR_TEST_DIR}/db/", dirs_exist_ok=True) + + logging.info(f"Copying files from {DATA_ROOT_DIR}/{folders[index]}/clearing_testing_utils/ to {CLR_TEST_DIR}/clearing-all/clearing_testing_utils/") + shutil.copytree(f"{DATA_ROOT_DIR}/{folders[index]}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/", dirs_exist_ok=True) + remove_files_with_extensions(".xml") + change_date(folders[index]) + run_docker(folders[index]) + + def main(): folders = [i for i in sorted(os.listdir(DATA_ROOT_DIR)) if re.search("\\d{1,}.\\d{1,}.*", i)]