From f79cb48b474c32a280e9acb53ed6eb99ac4b58e1 Mon Sep 17 00:00:00 2001 From: Henrik tom Woerden <henrik.tom-woerden@ds.mpg.de> Date: Fri, 19 Jul 2019 10:36:58 +0200 Subject: [PATCH] F ci --- .gitlab-ci.yml | 58 ++++---------------------------------- src/test/docker/Dockerfile | 4 +-- 2 files changed, 7 insertions(+), 55 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 424da6b4..55f60445 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,9 @@ # # ** end header # + variables: - CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest + CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest # When using dind service we need to instruct docker, to talk with the # daemon started inside of the service. The daemon is available with # a network connection instead of the default /var/run/docker.sock socket. @@ -46,66 +47,16 @@ services: image: $CI_REGISTRY_IMAGE stages: - setup - - code-generation - - build - test - - clean - deploy -########## -# SETUP -########## - -# delete local maven repo to be sure all packages are still maintained by the maven repos -setup:mvn: - tags: [ java10 ] - stage: setup +test: + stage: test script: - make easy-units - mvn dependency:purge-local-repository - - -################## -# Code-generation -################## - -# generate parsing classes with antlr -code-generation:antlr: - tags: [ java10 ] - stage: code-generation - artifacts: - paths: - - target/generated-sources/antlr4/ - script: - mvn antlr4:antlr4 - -######### -# Build -######### - -# compile the server -build:server: - tags: [ java10 ] - stage: build - dependencies: - - code-generation:antlr - artifacts: - paths: - - target/classes/ - script: - mvn compile - -######## -# Test -######## - -# junit tests for the server -test:server: - tags: [ java10 ] - stage: test - dependencies: - - build:server - script: - echo "defaultRealm = CaosDB" > conf/ext/usersources.ini - mvn test @@ -128,6 +79,7 @@ build-testenv: # use here general latest or specific branch latest... - docker pull $CI_REGISTRY_IMAGE || true - docker build + --pull --cache-from $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE . - docker push $CI_REGISTRY_IMAGE diff --git a/src/test/docker/Dockerfile b/src/test/docker/Dockerfile index 8be92ff9..9e7bd9a7 100644 --- a/src/test/docker/Dockerfile +++ b/src/test/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:latest +FROM debian:stretch RUN apt-get update && \ apt-get install git make mariadb-server maven openjdk-8-jdk-headless \ - python3-pip screen libpam0g-dev unzip -y + python3-pip screen libpam0g-dev unzip curl -y -- GitLab