diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9313c184e71cb8bf3131baeb1db6cedfb24f7cd2..ef29be9d551ebaec233b7fc8a1e4f8255822a302 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,11 +159,11 @@ test: - 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_pylib_commit > hash_pylib - - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui - - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_server_commit > hash_server - - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit > hash_mysql - - docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_proto_commit > hash_proto + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_pylib_commit > hash_pylib + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_server_commit > hash_server + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_mysqlbackend_commit > hash_mysql + - docker exec -u 0 -t docker-caosdb-server-1 cat /opt/caosdb/git/caosdb_proto_commit > hash_proto - cat hash_server - cat hash_proto - cat hash_mysql @@ -175,8 +175,8 @@ test: - /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