From 9727e02c16663e14f4ab95e1271c4a1dff4fd2ef Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Tue, 4 Jun 2024 10:10:06 +0300 Subject: [PATCH] .gitlab-ci.yml updated v61 --- clr_test/clearing-all/Dockerfile | 8 ++------ clr_test/clearing-all/launch_and_test.sh | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/clr_test/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile index acc5e3879..cb2476d7b 100644 --- a/clr_test/clearing-all/Dockerfile +++ b/clr_test/clearing-all/Dockerfile @@ -39,10 +39,6 @@ RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-tester/*.sh RUN apk update && apk add git make libc-dev gcc RUN git clone https://github.com/wolfcw/libfaketime.git -WORKDIR libfaketime/src/ -RUN make install -WORKDIR $CLEARING_HOME -RUN pwd -RUN ls -la +RUN make install -C libfaketime/src/ -ENTRYPOINT [ "./launch_and_test.sh" ] \ No newline at end of file +ENTRYPOINT [ "./launch_and_test_faketime.sh" ] \ No newline at end of file diff --git a/clr_test/clearing-all/launch_and_test.sh b/clr_test/clearing-all/launch_and_test.sh index 54dad2c20..adb0c3424 100644 --- a/clr_test/clearing-all/launch_and_test.sh +++ b/clr_test/clearing-all/launch_and_test.sh @@ -6,14 +6,14 @@ cd $CLEARING_HOME/ date echo Start CLEARING system -LD_PRELOAD=/usr/local/lib/faketime/libfaketime.so.1 FAKETIME_DONT_FAKE_MONOTONIC=1 FAKETIME="@2020-12-24 20:30:00" sh ./launch_all.sh +sh ./launch_all.sh sleep 15 echo Run test case -LD_PRELOAD=/usr/local/lib/faketime/libfaketime.so.1 FAKETIME_DONT_FAKE_MONOTONIC=1 FAKETIME="@2020-12-24 20:30:00" sh ./clearing_testing_utils/run_test_env.sh +sh ./clearing_testing_utils/run_test_env.sh echo Run clearing-tester -LD_PRELOAD=/usr/local/lib/faketime/libfaketime.so.1 FAKETIME_DONT_FAKE_MONOTONIC=1 FAKETIME="@2020-12-24 20:30:00" sh ./clearing_testing_utils/clearing-tester/clearing-tester.sh +sh ./clearing_testing_utils/clearing-tester/clearing-tester.sh ls -la clearing_testing_utils/store/results/