treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix v4

Browse source
This commit is contained in:
Ivan Nikolaev-Axenov 2025-03-21 10:55:21 +03:00
parent b3f04e678d
commit 063877f3dd
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -54,7 +54,6 @@ test:
script: script:
- echo "Installing maven and python" && apk update && apk add maven python3 - 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 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 - 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 "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 - echo "Cleaning up log volume" && docker volume rm clr_test_logs_volume

2
clr_test/docker-compose.yml
View file

@ -57,7 +57,7 @@ services:
image: mirror.gcr.io/atmoz/sftp image: mirror.gcr.io/atmoz/sftp
volumes: volumes:
- ./sftp_data:/home/user - ./sftp_data:/home/user
command: user:Aa111111:1001 command: user:Aa111111:::in,out,in/prc,in/rdc,out/prc,out/rdc
volumes: volumes:
logs_volume: logs_volume:

5
clr_test/run_test_docker_containers.py
View file

@ -33,12 +33,14 @@ def run_docker(folder_name: str) -> int:
logging.info("Starting docker compose") 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) 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("..") os.chdir("..")
if code != 0: if code != 0:
sys.exit(code) sys.exit(code)
logging.info(os.listdir(f"{CLR_TEST_DIR}/mnt/results"))
return code return code
@ -90,7 +92,6 @@ def apply_test_case(folder: str) -> None:
os.mkdir(f"{CLR_TEST_DIR}/sftp_data/out/prc") os.mkdir(f"{CLR_TEST_DIR}/sftp_data/out/prc")
remove_directory(f"{CLR_TEST_DIR}/sftp_data/out/rdc") remove_directory(f"{CLR_TEST_DIR}/sftp_data/out/rdc")
os.mkdir(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/", copy_directory(f"{DATA_ROOT_DIR}/{folder}/clearing_testing_utils/",
f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/") f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/")