From bbb11f76f733fcab8a73ef926486ad1b088deda5 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 9 Jun 2021 13:14:26 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 7 +++----
.docker/run.sh | 3 +--
.docker/tester.yml | 2 --
.gitlab-ci.yml | 11 +++--------
4 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index d043228..17f34da 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,5 +1,4 @@
ARG CPPLIB_REGISTRY_IMAGE
-ARG CPPLIB_VERSION=bla
FROM $CPPLIB_REGISTRY_IMAGE
COPY .docker/wait-for-it.sh /wait-for-it.sh
@@ -8,7 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
WORKDIR /libcaosdb/
RUN mkdir build
WORKDIR /libcaosdb/build
-RUN cmake ..
+RUN cmake -D INSTALL_DIR_NAME=libcaosdb..
RUN cmake --build .
RUN cmake --install . --prefix /usr/local/
@@ -22,10 +21,10 @@ 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-$ENV_CPPLIB_VERSION && \
+ ls -la /usr/local/lib/libcaosdb && \
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 .. && \
cmake --build . && \
ctest
diff --git a/.docker/run.sh b/.docker/run.sh
index 3853bef..b0e1a71 100755
--- a/.docker/run.sh
+++ b/.docker/run.sh
@@ -1,6 +1,5 @@
#!/bin/sh
-echo $CPPLIB_VERSION
-CPPLIB_VERSION=$CPPLIB_VERSION docker-compose -f tester.yml run tester
+docker-compose -f tester.yml run tester
rv=$?
echo $rv > result
diff --git a/.docker/tester.yml b/.docker/tester.yml
index da03270..1673eed 100644
--- a/.docker/tester.yml
+++ b/.docker/tester.yml
@@ -4,8 +4,6 @@ services:
image: "$CPPINTTEST_REGISTRY_IMAGE"
networks:
- docker_caosnet
- environment:
- ENV_CPPLIB_VERSION: "$CPPLIB_VERSION"
volumes:
- type: bind
source: ./cert
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c0297e..49356e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,16 +33,11 @@ variables:
# this is the name of the image in the /image-cache/ directory
CPPINTTEST_IMAGE_CACHE: caosdb-cppinttest-testenv:$CI_COMMIT_REF_NAME.tar
-
-
## FOR DEBUGGING
TRIGGERED_BY_REPO: CPPINTTEST
TRIGGERED_BY_REF: $CI_COMMIT_REF_NAME
TRIGGERED_BY_HASH: $CI_COMMIT_SHORT_SHA
- ## Run tests against this cpplib version
- CPPLIB_VERSION: 0.0.1
-
# This is the caosdb-deploy branch which build the images for caosdb-server and caosdb-mysql
# TODO change to dev after merge of f-grpc to dev
@@ -65,6 +60,7 @@ info:
- echo "$CI_REGISTRY_IMAGE_BASE"
- echo "$CPPINTTEST_REGISTRY_IMAGE"
- echo "$CPPINTTEST_IMAGE_CACHE"
+ - echo "$CAOSDB_TAG"
# Build a docker image in which tests for this repository can run
@@ -95,7 +91,6 @@ build-testenv:
- docker pull $CPPLIB_REGISTRY_IMAGE || true # remove??? docker build --pull???
- docker build
--build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE
- --build-arg CPPLIB_VERSION=$CPPLIB_VERSION
--file .docker/Dockerfile
--pull
--cache-from $CPPINTTEST_REGISTRY_IMAGE
@@ -115,7 +110,7 @@ build-test:
- echo $PWD
- mkdir build
- cd build
- - cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-${CPPLIB_VERSION} ..
+ - cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb ..
- cmake --build .
@@ -164,7 +159,7 @@ test:
# the pyinttest docker writes the return value of the tests into the
# file result
- - CPPLIB_VERSION=$CPPLIB_VERSION /bin/sh ./run.sh
+ - /bin/sh ./run.sh
# collect log files
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
--
GitLab