diff --git a/.docker/Dockerfile b/.docker/Dockerfile index c686793999e9ca7b1cf2f3bb58c77792dd810af2..7d95c5ddb0d18ea251fc63891304be1a3beed94b 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -17,4 +17,4 @@ RUN rm -r /git/.git \ && mv /git/.docker/pycaosdb.ini /git/integrationtests/full_test RUN cd /git && pip3 install . WORKDIR /git/integrationtests/full_test -CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- ./test.sh +CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh diff --git a/.docker/run.sh b/.docker/run.sh new file mode 100755 index 0000000000000000000000000000000000000000..00c7618f87295fbe67c7c485a9204b46adb1a438 --- /dev/null +++ b/.docker/run.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +docker-compose -f tester.yml run tester +rv=$? +echo $rv > result diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 785d9b13dec37033d97bcc113cb14413f7c7caba..454bac96e402f34ebc5e8082e309f3faa18ed17d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,10 +49,18 @@ test: - docker pull $CI_REGISTRY_IMAGE:latest - EXEPATH=`pwd` CAOSDB_TAG=$CAOSDB_TAG docker-compose -f .docker/docker-compose.yml up -d - - docker-compose -f .docker/tester.yml run tester - - rc=$? + - /bin/sh ./run.sh + - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt + - docker logs docker_sqldb_1 &> ../mariadb_log.txt - docker-compose -f .docker/docker-compose.yml down + - rc=`cat result` - exit $rc + artifacts: + paths: + - caosdb_log.txt + - mariadb_log.txt + when: on_failure + expire_in: 1 week build-testenv: tags: [notls]