From ad420d41880e17666d457f64c89149729112252d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 5 Nov 2019 22:07:56 +0100
Subject: [PATCH] MAINT: larger timeout; logs and correct return value
---
.docker/Dockerfile | 2 +-
.docker/run.sh | 5 +++++
.gitlab-ci.yml | 12 ++++++++++--
3 files changed, 16 insertions(+), 3 deletions(-)
create mode 100755 .docker/run.sh
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index c6867939..7d95c5dd 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 00000000..00c7618f
--- /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 785d9b13..454bac96 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]
--
GitLab