From af0f197c4996d84f4a5fb01659197f0677dc02cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 18 Jul 2019 12:25:06 +0200
Subject: [PATCH] ci
---
.docker/docker-compose.yml | 4 ----
.docker/tester.yml | 4 ++++
.gitlab-ci.yml | 7 ++++++-
3 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 .docker/tester.yml
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 4081372..9edd0fc 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -12,7 +12,3 @@ services:
# - "from_outside:from_inside"
- "10443:10443"
- "10080:10080"
- tester:
- image: "$CI_REGISTRY_IMAGE:latest"
- depends_on:
- - caosdb-server
diff --git a/.docker/tester.yml b/.docker/tester.yml
new file mode 100644
index 0000000..50ea282
--- /dev/null
+++ b/.docker/tester.yml
@@ -0,0 +1,4 @@
+version: '3.7'
+services:
+ tester:
+ image: "$CI_REGISTRY_IMAGE:latest"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c941bd..bda6194 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,12 @@ test:
entrypoint: ["/bin/sh", "-c"]
script:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker-compose -f .docker/docker-compose.yml up
+ - cd .docker
+ - docker-compose up -d
+ - docker-compose -f tester.yml run tester
+ - rc=$?
+ - docker-compose down
+ - exit $rc
build-testenv:
tags: [docker]
--
GitLab