diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d362a7e..7c3eaad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,24 +50,22 @@ test:sytest: - "mkdir -p /app" - "cp ./conduit-x86_64-unknown-linux-musl /app/conduit" - "chmod +x /app/conduit" - - "rm -rf /src" - - "ln -s $CI_PROJECT_DIR/ /src" + - "rm -rf /src && ln -s $CI_PROJECT_DIR/ /src" - "mkdir -p /work/server-0/database/ && mkdir -p /work/server-1/database/ && mkdir -p /work/server-2/database/" - "cd /" script: - "SYTEST_EXIT_CODE=0" - "/bootstrap.sh conduit || SYTEST_EXIT_CODE=1" - - "perl /sytest/tap-to-junit-xml.pl --input /logs/results.tap --output /sytest.xml" + - "perl /sytest/tap-to-junit-xml.pl --puretap --input /logs/results.tap --output $CI_PROJECT_DIR/sytest.xml \"Sytest\" && cp /logs/results.tap $CI_PROJECT_DIR/results.tap" - "exit $SYTEST_EXIT_CODE" artifacts: when: always paths: - - "/logs/**/*.log" - - "/logs/**/*.log.*" - - "/logs/results.tap" - - "/sytest.xml" + - "$CI_PROJECT_DIR/sytest.xml" + - "$CI_PROJECT_DIR/results.tap" reports: - junit: "/sytest.xml" + junit: "$CI_PROJECT_DIR/sytest.xml" + # --------------------------------------------------------------------- #