Merge branch 'new_fix_ret' into 'dev'

fix return value

See merge request caosdb/caosdb-pyinttest!14

.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

.docker/run-test.sh

+#!/bin/bash
+
+tox
+echo $?>test_success

.docker/run.sh

+#!/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

.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: