From 0ce59f82f560cf388e463c1f303b2e6d3f7d80a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 18 Jul 2019 14:31:08 +0200
Subject: [PATCH] ci
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 18 ++++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 5aa884a..447469d 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -3,4 +3,4 @@ RUN apt-get update && \
apt-get install docker.io tox curl python3-pip -y
RUN pip3 install docker-compose
COPY wait-for-it.sh /wait-for-it.sh
-CMD /bin/bash
+CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- curl https://caosdb-server:10443
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73ed398..844a064 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,10 +52,10 @@ stages:
test:
tags: [docker]
- #image:
- # name: docker/compose:1.24.1
- # entrypoint: ["/bin/sh", "-c"]
- image: $CI_REGISTRY_IMAGE:latest
+ image:
+ name: docker/compose:1.24.1
+ entrypoint: ["/bin/sh", "-c"]
+ #image: $CI_REGISTRY_IMAGE:latest
script:
- if [[ "$CAOSDB_TAG" == "" ]]; then
CAOSDB_TAG=latest;
@@ -64,12 +64,10 @@ test:
- docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd .docker
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
- #- docker-compose -f tester.yml run tester
- #- rc=$?
- #- docker-compose down
- #- exit $rc
- - dip=`docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' docker_caosdb-server_1`
- - ./wait-for-it.sh $dip:10443 -t 120 -- curl https://$dip:10443
+ - docker-compose -f tester.yml run tester
+ - rc=$?
+ - docker-compose down
+ - exit $rc
- cd ..
build-testenv:
--
GitLab