.gitlab-ci.yml updated v126

.gitlab-ci.yml

@@ -39,12 +39,10 @@ build:
 test:
   stage: test
   variables:
-    MOUNT_POINT: "/builds/$CI_PROJECT_PATH/mnt"
     CLEARING_TEST_DIR: "/builds/mfd/clearing/clearing_test"
     CLR_TEST_DIR: "/builds/mfd/clearing/clr_test"
     RESULT_FILES_DIR: "/builds/mfd/clearing/clr_test/result-files"
   script:
-    - mkdir -p "$MOUNT_POINT"
     - echo "Installing maven and python" && apk update && apk add maven python3
     - echo "Copying jar files to clearing-all/bin" && cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clr_test/clearing-all/bin
     - echo "Copying DDL.sql to db directory" && cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db
@@ -52,15 +50,5 @@ test:
   artifacts:
     expire_in: 1 day
     when: always
-    paths:
-      - /builds/$CI_PROJECT_PATH/mnt
-
-collect_results:
-  stage: collect_results
-  script:
-    - cp -a /builds/mfd/clearing/clr_test/mnt/. $CI_PROJECT_DIR/clr_test/mnt/
-  artifacts:
-    name: "$CI_COMMIT_REF_NAME"
-    expire_in: 1 day
     paths:
       - $CI_PROJECT_DIR/clr_test/mnt

clr_test/clearing-all/clearing_testing_utils/clearing-tester/application.properties

@@ -3,7 +3,7 @@ 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/out
+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

clr_test/docker-compose.yml

@@ -34,10 +34,10 @@ services:
       - "7020:7020"
       - "8080:8080"
     volumes:
-      - /builds/mfd/clearing/clr_test/mnt/results:/opt/clearing/clearing_testing_utils/store/results
+      - ./mnt/results:/opt/clearing/clearing_testing_utils/store/results
-      - ${MOUNT_POINT}:/opt/clearing/bin/log
+      - ./mnt/logs/clearing:/opt/clearing/bin/log
-      - /builds/mfd/clearing/clr_test/mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs
+      - ./mnt/logs/tester:/opt/clearing/clearing_testing_utils/clearing-tester/logs
-      - /builds/mfd/clearing/clr_test/mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs
+      - ./mnt/logs/converter:/opt/clearing/clearing_testing_utils/clearing-converter/logs
     # restart: always
 
   zookeeper:

clr_test/run_test_docker_containers.py

@@ -52,31 +52,6 @@ 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)]
 
@@ -104,5 +79,4 @@ def main():
 
 
 if __name__=='__main__':
-    run_first()
+    main()
-    # main()