From 259826895ecdcfa0cb661d2736fd00a771f1bbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 1 Nov 2019 10:00:12 +0000
Subject: [PATCH] fix return value
---
.docker/Dockerfile | 2 +-
.docker/run-test.sh | 4 ++++
.docker/run.sh | 6 ++++++
.gitlab-ci.yml | 5 +----
4 files changed, 12 insertions(+), 5 deletions(-)
create mode 100755 .docker/run-test.sh
create mode 100755 .docker/run.sh
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index c2909e7..81d89ad 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,4 +7,4 @@ RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \
COPY . /git
RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git
WORKDIR /git
-CMD /wait-for-it.sh caosdb-server:10443 -t 300 -- tox
+CMD .docker/run.sh
diff --git a/.docker/run-test.sh b/.docker/run-test.sh
new file mode 100755
index 0000000..4eb06dc
--- /dev/null
+++ b/.docker/run-test.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+tox
+echo $?>test_success
diff --git a/.docker/run.sh b/.docker/run.sh
new file mode 100755
index 0000000..575a498
--- /dev/null
+++ b/.docker/run.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+/wait-for-it.sh caosdb-server:10443 -t 300 -- .docker/run-test.sh
+cat test_success
+rv=`cat test_success`
+echo $rv
+exit $rv
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b652fd..5356d8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,14 +82,11 @@ test:
- DIR=`pwd`
- CERTPATH=$DIR"/cert" CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
# prevent this script from terminating when the return value is non-zero
- - set +e
- docker-compose -f tester.yml run tester
- - rc=$?
- - echo $rc
- - set -e
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
- docker logs docker_sqldb_1 &> ../mariadb_log.txt
- docker-compose down
+ - rc=`cat /git/test_success`
- exit $rc
artifacts:
paths:
--
GitLab