From 3f9bc124ca2b0ec9b00ae89ed29e02768c72b32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de> Date: Tue, 2 Mar 2021 11:22:58 +0100 Subject: [PATCH] Refactor CI pipeline --- .gitlab-ci.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d48e1cd25..0038e5e07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,17 @@ stages: - check - deploy +.dind: + tags: + - exec-dind + # see https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled + # for image usage and settings for building with TLS and docker in docker + image: docker:19.03.1 + services: + - docker:19.03.1-dind + variables: + DOCKER_TLS_CERTDIR: "/certs" + # Theodolite Benchmarks @@ -82,21 +93,14 @@ spotbugs-benchmarks: .deploy-benchmarks: stage: deploy - extends: .benchmarks + extends: + - .benchmarks + - .dind needs: - build-benchmarks - checkstyle-benchmarks - pmd-benchmarks - spotbugs-benchmarks - tags: - - exec-dind - # see https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled - # for image usage and settings for building with TLS and docker in docker - image: docker:19.03.1 - services: - - docker:19.03.1-dind - variables: - DOCKER_TLS_CERTDIR: "/certs" script: - DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//') - docker build --pull -t $IMAGE_NAME ./$JAVA_PROJECT_NAME @@ -172,13 +176,8 @@ deploy-uc4-load-generator: deploy-theodolite: stage: deploy - tags: - - exec-dind - image: docker:19.03.1 - services: - - docker:19.03.1-dind - variables: - DOCKER_TLS_CERTDIR: "/certs" + extends: + - .dind script: - DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//') - docker build --pull -t theodolite ./execution -- GitLab