From 663daac45f53b98abee5bf188dcc72d8206f2ee2 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 12:51:25 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 1 +
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 4ac1cc7..1fcb1d7 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -12,6 +12,7 @@ RUN cmake --build .
RUN cmake --install . --prefix /usr/local/
+WORKDIR /cppinttest/
CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- \
# ... and run tests
ctest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5e147a..3294982 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,7 @@ test:
- docker logs docker_sqldb_1 &> ../mariadb_log.txt
# shut down
- - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f .docker/docker-compose.yml down
+ - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml down
# collect results
- rc=`cat result`
--
GitLab