diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e187c7f4..29c861515 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,6 @@ 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 - - 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/docker-compose.yml b/clr_test/docker-compose.yml index 094ed5331..2c843a755 100644 --- a/clr_test/docker-compose.yml +++ b/clr_test/docker-compose.yml @@ -57,7 +57,7 @@ services: image: mirror.gcr.io/atmoz/sftp volumes: - ./sftp_data:/home/user - command: user:Aa111111:1001 + command: user:Aa111111:::in,out,in/prc,in/rdc,out/prc,out/rdc volumes: logs_volume: diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index 5a4b603c6..acc96ff1e 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -33,12 +33,14 @@ def run_docker(folder_name: str) -> int: logging.info("Starting docker compose") code = subprocess.call('docker compose up --abort-on-container-exit --exit-code-from clearing_system --build --force-recreate', shell=True) - logging.info(os.listdir(f"{CLR_TEST_DIR}/mnt/results")) + os.chdir("..") if code != 0: sys.exit(code) + logging.info(os.listdir(f"{CLR_TEST_DIR}/mnt/results")) + return code @@ -90,7 +92,6 @@ 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/")