diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad090e086df557ee02ade271e7a4257c7c76f2ce..765fe58dee0e2e3baa9b583eeab7a67cb0a222ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,17 +180,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 Julia integration test docker writes the return value of the # tests into the file result - F_BRANCH=$F_BRANCH /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 the CaosDB server - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down || true