diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 247e34a21be25edf659733fc62e6d6c56214d159..77c65b573f1cef0fbcfefa1c788effec79ec8c50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,17 +136,17 @@ test: # here the server and the mysql backend docker are being started - CAOSDB_TAG="$CAOSDB_TAG" docker-compose up -d # store versions of CaosDB parts - - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit | tee hash_server - - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit | tee hash_mysql - - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_proto_commit | tee hash_proto + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_server_commit | tee hash_server + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit | tee hash_mysql + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_proto_commit | tee hash_proto # the pyinttest docker writes the return value of the tests into the # file result - /bin/sh ./run.sh # collect log files - - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt - - docker logs docker_sqldb_1 &> ../mariadb_log.txt + - docker logs docker-caosdb-server-1 &> ../caosdb_log.txt + - docker logs docker-sqldb-1 &> ../mariadb_log.txt # shut down - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down