summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-08-26 18:13:48 +0200
committerlouiz’ <louiz@louiz.org>2018-08-26 18:13:48 +0200
commit7f50a3c3d2af31eb29f2ba467ead998c31d16943 (patch)
tree290923cb67df16bbecdb924fb1f94dd0d0bf7da7
parentb9f6fbd8405c1d16ca637fb32850d44173528e46 (diff)
downloadbiboumi-7f50a3c3d2af31eb29f2ba467ead998c31d16943.tar.gz
biboumi-7f50a3c3d2af31eb29f2ba467ead998c31d16943.tar.bz2
biboumi-7f50a3c3d2af31eb29f2ba467ead998c31d16943.tar.xz
biboumi-7f50a3c3d2af31eb29f2ba467ead998c31d16943.zip
Run the test_suite in the test phase, and do the coverage only on fedora
-rw-r--r--.gitlab-ci.yml22
1 files changed, 10 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0b46bc..84eeb76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,6 @@ variables:
- cd build/
- cmake .. -DCMAKE_CXX_FLAGS="-Werror -Wno-psabi" -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3} ${POSTGRESQL}
- make everything -j$(nproc || echo 1)
- - make coverage_check -j$(nproc || echo 1)
artifacts:
expire_in: 2 weeks
paths:
@@ -111,8 +110,8 @@ build:no_db_botan:
- docker
script:
- cd build/
- - make coverage_e2e -j$(nproc || echo 1)
- - make coverage
+ - make check -j$(nproc || echo 1)
+ - make e2e -j$(nproc || echo 1)
artifacts:
expire_in: 2 weeks
paths:
@@ -132,6 +131,11 @@ test:debian:
test:fedora:
image: docker.louiz.org/louiz/biboumi/test-fedora:latest
<<: *basic_test
+ script:
+ - cd build/
+ - make coverage_check -j$(nproc || echo 1)
+ - make coverage_e2e -j$(nproc || echo 1)
+ - make coverage
dependencies:
- build:fedora
@@ -143,18 +147,12 @@ test:no_udns:
test:alpine:
image: docker.louiz.org/louiz/biboumi/test-alpine:latest
- stage: test
- tags:
- - docker
- script:
- - cd build/
- - make e2e
+ <<: *basic_test
dependencies:
- - build:alpine
+ - build:debian
+ image: docker.louiz.org/louiz/biboumi/test-alpine:latest
test:freebsd:
- only:
- - branches@louiz/biboumi
tags:
- freebsd
variables: