From f8be014b5743513ff39686360c0f06972cc6d088 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 28 Jun 2021 11:45:40 +0200
Subject: [PATCH] WIP: pipeline more logging during pipeline
---
.docker/Dockerfile | 7 ++-----
.gitlab-ci.yml | 6 ++++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 70c37e0..e7a17cb 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -19,12 +19,9 @@ RUN apt-get install -y openjdk-11-jdk-headless
# build and run tests
-CMD ls -la && \
- ls -la /usr/local/lib/ && \
- ls -la /usr/local/lib/libcaosdb && \
- mkdir build && \
+CMD mkdir build && \
cd build && \
- /wait-for-it.sh caosdb-server:10443 -t 500 -- \
cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb .. && \
cmake --build . && \
+ /wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c21d3d6..4c10280 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,6 +160,10 @@ 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 > 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_server
# the pyinttest docker writes the return value of the tests into the
# file result
@@ -179,6 +183,8 @@ test:
- echo mariadb:$(docker image ls mariadb | grep mariadb | awk '{print $2}')
- docker save mariadb:$(docker image ls mariadb | grep mariadb | awk '{print $2}') > /image-cache/mariadb.tar || true
+ - cat ../caosdb_log.txt
+
# exit with fail when errors exist
- exit $rc
timeout: 3h
--
GitLab