diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8e78cb26..5e187c7f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ test: script: - 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 ./clr_test/db/ + - chmod -R 777 ./clr_test/sftp_data - python3 clr_test/run_test_docker_containers.py - echo "Copying logs" && mkdir -p artifacts/logs && docker run --rm -v clr_test_logs_volume:/logs alpine tar -C /logs -cf - . | tar -C artifacts/logs -xf - - echo "Cleaning up log volume" && docker volume rm clr_test_logs_volume diff --git a/clr_test/clearing-all/files/dbf/in/.gitkeep b/clr_test/clearing-all/files/dbf/in/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/clr_test/clearing-all/files/dbf/out/.gitkeep b/clr_test/clearing-all/files/dbf/out/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/clr_test/clearing-all/files/swt/in/.gitkeep b/clr_test/clearing-all/files/swt/in/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/clr_test/clearing-all/files/swt/out/.gitkeep b/clr_test/clearing-all/files/swt/out/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/clr_test/clearing-all/files/xml/in/.gitkeep b/clr_test/clearing-all/files/xml/in/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/clr_test/clearing-all/files/xml/out/.gitkeep b/clr_test/clearing-all/files/xml/out/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml index 2e90e0ab6..094ed5331 100644 --- a/clr_test/docker-compose.yml +++ b/clr_test/docker-compose.yml @@ -55,18 +55,10 @@ services: sftp: image: mirror.gcr.io/atmoz/sftp - security_opt: - - seccomp:unconfined volumes: - ./sftp_data:/home/user command: user:Aa111111:1001 volumes: - db: - driver: local - zookeeper_data: - driver: local - kafka_data: - driver: local logs_volume: driver: local \ No newline at end of file diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index c4e9e82ae..5a4b603c6 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -90,6 +90,7 @@ def apply_test_case(folder: str) -> None: os.mkdir(f"{CLR_TEST_DIR}/sftp_data/out/prc") remove_directory(f"{CLR_TEST_DIR}/sftp_data/out/rdc") os.mkdir(f"{CLR_TEST_DIR}/sftp_data/out/rdc") + subprocess.call(f"chmod -R 777 {CLR_TEST_DIR}/sftp_data", shell=True) copy_directory(f"{DATA_ROOT_DIR}/{folder}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/")