From 6d897114d7e8e8df4308141265b2f5e3d2345052 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 22:04:01 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 12 +++++++++---
.docker/tester.yml | 3 ---
.gitlab-ci.yml | 6 ------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index f6b397e..37a931c 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,4 +1,5 @@
ARG CPPLIB_REGISTRY_IMAGE
+ARG CPPLIB_VERSION
FROM $CPPLIB_REGISTRY_IMAGE
COPY .docker/wait-for-it.sh /wait-for-it.sh
@@ -17,6 +18,11 @@ RUN rm -rf .git
RUN apt-get install -y openjdk-11-jdk-headless
-CMD ls -la && cd build/ && /wait-for-it.sh caosdb-server:10443 -t 500 -- \
- # ... and run tests
- cmake .. && cmake --build . && ctest
+# build and run tests
+CMD ls -la && \
+ mkdir build && \
+ cd build && \
+ /wait-for-it.sh caosdb-server:10443 -t 500 -- \
+ cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-${CPPLIB_VERSION} .. && \
+ cmake --build . && \
+ ctest
diff --git a/.docker/tester.yml b/.docker/tester.yml
index 383bad2..1673eed 100644
--- a/.docker/tester.yml
+++ b/.docker/tester.yml
@@ -5,9 +5,6 @@ services:
networks:
- docker_caosnet
volumes:
- - type: bind
- source: ../build
- target: /caosdb-cppinttest/build
- type: bind
source: ./cert
target: /cert
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c63c0f..f71fc76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,10 +116,6 @@ build-test:
- cd build
- cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-${CPPLIB_VERSION} ..
- cmake --build .
- artifacts:
- paths:
- - build/
- expire_in: 1 week
test:
@@ -134,8 +130,6 @@ test:
stage: test
image: $CI_REGISTRY_IMAGE_BASE
needs:
- - job: build-test
- artifacts: true
- job: cert
artifacts: true
script:
--
GitLab