From 077fb2351e6107d49dc24d72dee7fd7d0149816f Mon Sep 17 00:00:00 2001
From: fspreck <f.spreckelsen@indiscale.com>
Date: Wed, 5 Oct 2022 11:22:40 +0200
Subject: [PATCH] FIX: Make pipeline compatible to docker-compose v2
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 247e34a..77c65b5 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
--
GitLab