diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f0bca1d9..173ccdd22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ test: paths: - /builds/mfd/clearing/clr_test/mnt/testFiles script: - - apk update && apk add maven python3 git make libc-dev gcc openjdk17-jre + - apk update && apk add maven python3 - cd clr_test - pwd - cp -r /builds/mfd/clearing/z-distr/target/clearing/bin ./clearing-all/bin @@ -53,11 +53,7 @@ test: - mkdir -p mnt/testFiles - echo "Hello, World" >> mnt/testFiles/1.txt - cat mnt/testFiles/1.txt - - git clone https://github.com/wolfcw/libfaketime.git - - cd libfaketime/src/ - - make install - - cd - - - LD_PRELOAD=/usr/local/lib/faketime/libfaketime.so.1 FAKETIME_DONT_FAKE_MONOTONIC=1 FAKETIME="@2020-12-24 20:30:00" python3 run_test_docker_containers.py + - python3 run_test_docker_containers.py - ls mnt - ls mnt/testFiles # - docker-compose down --volumes diff --git a/clr_test/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile index 642024503..779a4d68a 100644 --- a/clr_test/clearing-all/Dockerfile +++ b/clr_test/clearing-all/Dockerfile @@ -35,4 +35,11 @@ RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/*.sh RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-checker/*.sh RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-converter/*.sh RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-tester/*.sh -ENTRYPOINT [ "./launch_and_test.sh" ] \ No newline at end of file + +RUN apk update && apk add git make libc-dev gcc openjdk17-jre +RUN git clone https://github.com/wolfcw/libfaketime.git +WORKDIR libfaketime/src/ +RUN make install +WORKDIR $CLEARING_HOME + +ENTRYPOINT [ "./launch_and_test_faketime.sh" ] \ No newline at end of file diff --git a/clr_test/clearing-all/launch_and_test_faketime.sh b/clr_test/clearing-all/launch_and_test_faketime.sh new file mode 100644 index 000000000..eb3626555 --- /dev/null +++ b/clr_test/clearing-all/launch_and_test_faketime.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +CLEARING_HOME=/opt/clearing/ +cd $CLEARING_HOME/ + +LD_PRELOAD=/usr/local/lib/faketime/libfaketime.so.1 FAKETIME_DONT_FAKE_MONOTONIC=1 FAKETIME="@2020-12-24 20:30:00" sh ./launch_and_test.sh diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index b53f14f59..04377f132 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -1,4 +1,3 @@ -from datetime import date import os import re import shutil @@ -18,7 +17,6 @@ def run_docker(folder_name): def main(): - print(date.today()) folders = [i for i in sorted(os.listdir(DATA_ROOT_DIR)) if re.search("\\d{1,}.\\d{1,}.*", i)] shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store/expected") shutil.rmtree(f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/store/input")