FIX: certificat problem and return value

- The return value does not persist over lines in gitlab.yml file
- The return value of tests is now saved in a file and read from it
- The certificate of the docker container is now used. This prevents
outdating

.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 .docker/run.sh
+CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- tox

.docker/docker-compose.yml

@@ -13,10 +13,6 @@ services:
       - sqldb
     networks:
       - caosnet
-    volumes:
-      - type: bind
-        source: "$CERTPATH"
-        target: /opt/caosdb/cert
     ports:
       # - "from_outside:from_inside"
       - "10443:10443"

.docker/pycaosdb.ini

@@ -4,7 +4,7 @@ test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/
 [Connection]
 url=https://caosdb-server:10443
 username=admin
-cacert=.docker/cert/caosdb.cert.pem
+cacert=/cert/caosdb.cert.pem
 #cacert=/etc/ssl/cert.pem
 debug=0
 

.docker/run-test.sh

-#!/bin/bash
-
-tox
-echo $?>/test_success
-echo "Saved result value"

.docker/run.sh

-#!/bin/bash
-/wait-for-it.sh caosdb-server:10443 -t 500 -- .docker/run-test.sh
+#!/bin/sh
+
+docker-compose -f tester.yml run tester 
+rv=$?
+echo $rv > result

.docker/tester.yml

@@ -4,6 +4,10 @@ services:
     image: "$CI_REGISTRY_IMAGE:latest"
     networks:
       - docker_caosnet
+    volumes:
+      - type: bind
+        source: ./cert
+        target: /cert
 networks:
   docker_caosnet:
     external: true

.gitlab-ci.yml

@@ -79,21 +79,20 @@ test:
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       - docker pull $CI_REGISTRY_IMAGE:latest
       - cd .docker
-      - 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
-      - docker-compose -f tester.yml run tester 
+      - CAOSDB_TAG=$CAOSDB_TAG docker-compose  up -d
+      - docker cp docker_caosdb-server_1:/opt/caosdb/cert cert
+        # writes the return value of the tests into the file result
+      - /bin/sh ./run.sh 
       - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
       - docker logs docker_sqldb_1 &> ../mariadb_log.txt
       - docker-compose down
-      - docker cp docker_tester_1:/test_success test_success 
-      - rc=`cat test_success`
+      - rc=`cat result`
       - exit $rc
   artifacts:
     paths:
       - caosdb_log.txt
       - mariadb_log.txt
-        #when: on_failure
+    when: on_failure
     expire_in: 1 week
 
 build-testenv: