From fb0397d99f4cb85b74f97dcc948f26a21c09fa2c Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 3 Feb 2020 20:28:17 +0100
Subject: [PATCH] WIP: setup pipeline
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 14ae750..ee4e868 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,3 +1,3 @@
FROM debian:stretch
RUN apt-get update && \
- apt-get install curl -y
+ apt-get install curl mariadb-server -y
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec4dfb0..78b09fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,12 +21,11 @@
variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-mysqlbackend-testenv:latest
- # When using dind, it's wise to use the overlayfs driver for
- # improved performance.
image: $CI_REGISTRY_IMAGE
stages:
- setup
+ - test
- deploy
# Trigger building of server image and integration tests
@@ -41,6 +40,13 @@ trigger_build:
-F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
-F ref=dev https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
+unittests:
+ tags: [ docker ]
+ stage: test
+ script:
+ - cp config.defaults .config
+ - make test
+
# Build a docker image in which tests for this repository can run
build-testenv:
tags: [ cached-dind ]
--
GitLab