From 939a031c7c79824bb6efa736eddf869fc4adc942 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 8 Jun 2021 00:40:38 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 6 +++---
.docker/run.sh | 3 ++-
.gitlab-ci.yml | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 0a7d2f0..956a017 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,5 +1,5 @@
ARG CPPLIB_REGISTRY_IMAGE
-ARG CPPLIB_VERSION
+ARG CPPLIB_VERSION=bla
FROM $CPPLIB_REGISTRY_IMAGE
COPY .docker/wait-for-it.sh /wait-for-it.sh
@@ -24,10 +24,10 @@ RUN echo $ENV_CPPLIB_VERSION
# build and run tests
CMD ls -la && \
ls -la /usr/local/lib/ && \
- ls -la /usr/local/lib/libcaosdb-${ENV_CPPLIB_VERSION} && \
+ ls -la /usr/local/lib/libcaosdb-$ENV_CPPLIB_VERSION && \
mkdir build && \
cd build && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \
- cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-${ENV_CPPLIB_VERSION} .. && \
+ cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-$ENV_CPPLIB_VERSION .. && \
cmake --build . && \
ctest
diff --git a/.docker/run.sh b/.docker/run.sh
index b0e1a71..3853bef 100755
--- a/.docker/run.sh
+++ b/.docker/run.sh
@@ -1,5 +1,6 @@
#!/bin/sh
-docker-compose -f tester.yml run tester
+echo $CPPLIB_VERSION
+CPPLIB_VERSION=$CPPLIB_VERSION docker-compose -f tester.yml run tester
rv=$?
echo $rv > result
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a0ea33..5c0297e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,7 +164,7 @@ test:
# the pyinttest docker writes the return value of the tests into the
# file result
- - /bin/sh ./run.sh
+ - CPPLIB_VERSION=$CPPLIB_VERSION /bin/sh ./run.sh
# collect log files
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
--
GitLab