Merge branch 'dev' into f-double-white-space

.gitlab-ci.yml

@@ -135,9 +135,9 @@ test:
         # the pyinttest docker writes the return value of the tests into the
         # file result
       - /bin/sh ./run.sh
-      - cd ..
       - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
       - docker logs docker_sqldb_1 &> ../mariadb_log.txt
+      - cd ..
       - docker-compose -f .docker/docker-compose.yml down
       - rc=`cat .docker/result`
       - echo mariadb:$(docker image ls mariadb | grep mariadb | awk '{print $2}')