From 41fb03348839f021b61eb1a39b9ac46b6b88ee3f Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Tue, 2 Jul 2024 12:54:08 +0300 Subject: [PATCH] .gitlab-ci.yml updated v96 --- .gitlab-ci.yml | 5 ++--- clr_test/run_test_docker_containers.py | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3f866dbf..7dc376ce9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,13 +45,12 @@ test: untracked: true expire_in: 1 day paths: - - $CI_PROJECT_DIR + - $CI_PROJECT_DIR/ script: - echo $CI_PROJECT_DIR - pwd - echo "Installing maven and python" && apk update && apk add maven python3 - - cd clr_test # - echo "Copying jar files to clearing-all/bin" && cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin # - echo "Copying DDL.sql to db directory" && cp /builds/mfd/clearing/z-distr/target/clearing/db/DDL.sql ./db - - python3 run_test_docker_containers.py + - python3 clr_test/run_test_docker_containers.py - ls $CI_PROJECT_DIR/clr_test/mnt/results diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index e7e172ac9..b1067480b 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -16,9 +16,11 @@ RESULT_FILES_DIR = os.environ['RESULT_FILES_DIR'] def run_docker(folder_name, date): print(f"Running docker-compose for {folder_name}") + os.chdir("clr_test") subprocess.call('docker compose pull', shell=True) subprocess.call('docker compose build --no-cache', shell=True) subprocess.call('docker compose up --abort-on-container-exit --exit-code-from clearing_system', shell=True) + os.chdir("..") def read_date(folder_name):